Improved PHP handling

rmraya · Oct 22, 2022 · ef7c7ef · ef7c7ef
1 parent 6caa56e
commit ef7c7ef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/lib/openxliff.jar b/lib/openxliff.jar
diff --git a/src/com/maxprograms/converters/Constants.java b/src/com/maxprograms/converters/Constants.java
@@ -19,8 +19,8 @@ private Constants() {
 
 	public static final String TOOLID = "OpenXLIFF";
 	public static final String TOOLNAME = "OpenXLIFF Filters";
-	public static final String VERSION = "2.9.0";
-	public static final String BUILD = "20221022_0824";
+	public static final String VERSION = "2.9.1";
+	public static final String BUILD = "20221022_0917";
 
 	public static final String SUCCESS = "0";
 	public static final String ERROR = "1";

diff --git a/src/com/maxprograms/converters/php/Php2Xliff.java b/src/com/maxprograms/converters/php/Php2Xliff.java
@@ -114,12 +114,21 @@ public static List<String> run(Map<String, String> params) {
 						}
 					}
 					String text = sb.toString();
-
+					char finishMark = ')';
+					String start = "";
 					int index = text.indexOf("array(");
-					if (index == -1) {
-						throw new IOException("Selected file lacks \"array(\" declaration");
+					if (index != -1) {
+						start = text.substring(0, index + "array(".length());
+					} else if ((index = text.indexOf("return")) != -1) {
+						index = text.indexOf("[", index + "return".length());
+						if (index != -1) {
+							start = text.substring(0, index + "[".length());
+							finishMark = ']';
+						}
+					}
+					if (start.isEmpty()) {
+						throw new IOException("Initial array delimiter not found");
 					}
-					String start = text.substring(0, index + "array(".length());
 					writeSkeleton(skeleton, start);
 					text = text.substring(index + "array(".length());
 
@@ -129,7 +138,7 @@ public static List<String> run(Map<String, String> params) {
 						char delimiter = '\'';
 						for (int i = 0; i < text.length(); i++) {
 							char c = text.charAt(i);
-							if (c == ')') {
+							if (c == finishMark) {
 								finished = true;
 								break;
 							}
@@ -205,18 +214,9 @@ private static void writeSkeleton(FileOutputStream skeleton, String string)
 
 	private static void writeSegment(FileOutputStream output, FileOutputStream skeleton, String source)
 			throws IOException {
-		if (source.startsWith("'")) {
-			source = source.replaceAll("\\\\'", "'");
-			source = source.replaceAll("\\\\\\\\", "\\\\");
-		}
-		if (source.startsWith("\"")) {
-			source = source.replace("\\\\'", "'");
-			source = source.replace("\\\"", "\"");
-			source = source.replace("\\\\\\\\", "\\\\");
-			source = source.replace("\\\\n", "\n");
-			source = source.replace("\\\\r", "\r");
-			source = source.replace("\\\\$", "$");
-		}
+		source = source.replace("\\'", "'");
+		source = source.replace("\\\"", "\"");
+		source = source.replace("\\\\", "\\");
 		String delimiter = source.substring(0, 1);
 		source = source.substring(1);
 		source = source.substring(0, source.length() - 1);

diff --git a/src/com/maxprograms/converters/php/Xliff2Php.java b/src/com/maxprograms/converters/php/Xliff2Php.java
@@ -142,8 +142,8 @@ private static String extractText(Element target) {
 				result = result + ((TextNode) n).getText();
 			}
 		}
-		result = result.replace("\\\\", "\\\\\\\\");
-		result = result.replace("\\\'", "\\\\\'");
+		result = result.replace("'", "\\'");
+		result = result.replace("\"", "\\\"");
 		return result;
 	}