Author: markt
Date: Tue Nov 20 19:00:59 2018
New Revision: 1847045
URL: http://svn.apache.org/viewvc?rev=1847045&view=rev
Log:
Fix single quotes in strings with replacements on import/export rather than
trying to do it manually in POEditor.
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java
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=1847045&r1=1847044&r2=1847045&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
20 19:00:59 2018
@@ -29,6 +29,7 @@ public class Utils {
private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n",
Pattern.MULTILINE);
private static final Pattern ESCAPE_LEADING_SPACE =
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+ private static final Pattern FIX_SINGLE_QUOTE =
Pattern.compile("([^'])'([^'])", Pattern.MULTILINE);
private Utils() {
// Utility class. Hide default constructor.
@@ -63,6 +64,10 @@ public class Utils {
if (result.contains("\n\\\t")) {
result = result.replace("\n\\\t", "\n\\t");
}
+
+ if (result.contains("[{0}]")) {
+ result = FIX_SINGLE_QUOTE.matcher(result).replaceAll("$1''$2");
+ }
return result;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
