This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new bca868a10f 11.0.x is no longer the main branch. Don't skip updates for
English
bca868a10f is described below
commit bca868a10ff83dee03e2c650f58570124768830a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 19 16:58:16 2024 +0000
11.0.x is no longer the main branch. Don't skip updates for English
---
java/org/apache/tomcat/buildutil/translate/Import.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 81ba4431a4..888d141496 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -43,12 +43,8 @@ public class Import {
private static void processFile(File f) throws IOException {
String language = Utils.getLanguage(f.getName());
- // Skip the original
- if (language.length() == 0) {
- // Comment this line out if the originals need to be imported.
- return;
- }
-
+ // Unlike the main branch, don't skip the original so we can import
+ // updates to the English translations
Properties props = Utils.load(f);
Object[] objKeys = props.keySet().toArray();
Arrays.sort(objKeys);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
