Author: markt
Date: Tue Nov 13 13:31:55 2018
New Revision: 1846507
URL: http://svn.apache.org/viewvc?rev=1846507&view=rev
Log:
Improve the import process. Handle special cases of single quotes and tabs
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java?rev=1846507&r1=1846506&r2=1846507&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java Tue Nov
13 13:31:55 2018
@@ -120,9 +120,6 @@ public class Export {
Properties translation = translationEntry.getValue();
String language = translationEntry.getKey();
- if (language.length() > 0) {
- language = "_" + language;
- }
File out = new File(storageDir, Constants.L10N_PREFIX + language +
Constants.L10N_SUFFIX);
try (FileOutputStream fos = new FileOutputStream(out);
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java?rev=1846507&r1=1846506&r2=1846507&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java Tue Nov
13 13:31:55 2018
@@ -47,8 +47,6 @@ public class Import {
if (language.length() == 0) {
// Comment this line out if the originals needs to be exported.
return;
- } else {
- language = "_" + language;
}
Properties props = Utils.load(f);
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java?rev=1846507&r1=1846506&r2=1846507&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java Tue Nov
13 13:31:55 2018
@@ -36,13 +36,7 @@ public class Utils {
static String getLanguage(String name) {
- String language = name.substring(Constants.L10N_PREFIX.length(),
name.length() - Constants.L10N_SUFFIX.length());
- if (language.length() == 0) {
- // Default
- } else if (language.length() == 3) {
- language = language.substring(1);
- }
- return language;
+ return name.substring(Constants.L10N_PREFIX.length(), name.length() -
Constants.L10N_SUFFIX.length());
}
@@ -65,6 +59,14 @@ public class Utils {
result = result.substring(0, result.length() - 2);
}
result = ESCAPE_LEADING_SPACE.matcher(result).replaceAll("\\\\$1");
+
+ if (result.contains("{")) {
+ result = result.replace("'","''");
+ }
+
+ if (result.contains("\n\\\t")) {
+ result = result.replace("\n\\\t", "\n\\t");
+ }
return result;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
