Révision 3916

TXM/trunk/bundles/org.txm.translate.rcp/src/org/txm/rcp/translate/devtools/ImportMessagesTable.java (revision 3916)
112 112 
					String value2 = h.getCellByIndex(defaultIndex).getDisplayText();
113 113
114 114 
					// fix value
115 
					value = value.replaceAll("'([^'])", "''$1");
116 
					value = value.replaceAll("’", "'");
117 
					value = value.replace("''''", "''");
118 
					value = value.replace("'''", "''");
119 
					value2 = value2.replaceAll("'([^'])", "''$1");
120 
					value2 = value2.replaceAll("’", "'");
121 
					value2 = value2.replace("''''", "''");
122 
					value2 = value2.replace("'''", "''");
115 
					if (value.contains("{0}")) {
116 
						value = value.replaceAll("([^'])'([^'])", "$1''$2");
117 
						value = value.replaceAll("’", "'");
118 
						value = value.replace("''''", "''");
119 
						value = value.replace("'''", "''");
120 
						value2 = value2.replaceAll("([^'])'([^'])", "$1''$2");
121 
						value2 = value2.replaceAll("’", "'");
122 
						value2 = value2.replace("''''", "''");
123 
						value2 = value2.replace("'''", "''");
124 
					} else {
125 
						value = value.replace("'''", "'");
126 
						value = value.replace("''", "'");
127 
						value2 = value2.replace("'''", "'");
128 
						value2 = value2.replace("''", "'");
129 
					}
123 130
124 131 
					slave.setProperty(key, value);
125 132 
					master.setProperty(key, value2);
......
127 134 
			}
128 135 
		}
129 136
130 
		slave.store(IOUtils.getWriter(langPropertiesFile), "imported from " + tableFile);
131 
		master.store(IOUtils.getWriter(defaultPropertiesFile), "imported from " + tableFile);
137 
		slave.store(IOUtils.getWriter(langPropertiesFile, encoding), "imported from " + tableFile);
138 
		master.store(IOUtils.getWriter(defaultPropertiesFile, encoding), "imported from " + tableFile);
132 139
133 140 
		System.out.println("Import saved in master=" + defaultPropertiesFile);
134 141 
		System.out.println("Import saved in slave=" + langPropertiesFile);
TXM/trunk/bundles/org.txm.translate.rcp/src/org/txm/rcp/translate/i18n/PluginMessagesManager.java (revision 3916)
708 708 
					cmds.append("native2ascii " + newPropFile + " > " + newPropFile + ".tmp\n");
709 709 
					cmds.append("rm " + newPropFile + "\n");
710 710 
					cmds.append("mv " + newPropFile + ".tmp " + newPropFile + "\n");
711 
					props.store(IOUtils.getWriter(newPropFile, encoding), "TXM OSGI messages generated by the PluginMessagesManager class");
711
712 712 
				}
713 
				else {
714 
					props.store(IOUtils.getWriter(newPropFile, encoding), "TXM OSGI messages generated by the PluginMessagesManager class");
715 
				}
713
714 
				props.store(IOUtils.getWriter(newPropFile, encoding), "TXM OSGI messages generated by the PluginMessagesManager class");
716 715 
			}
717 716 
			if (utf8fixes) {
718 717 
				// System.out.println("WARNING: need to call: ");

Formats disponibles : Unified diff