[tomcat] branch 10.1.x updated: 10.1.x is no longer the main branch

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 3b0af7cd7f 10.1.x is no longer the main branch
3b0af7cd7f is described below

commit 3b0af7cd7ff6bb0532677969d72cadee63d42da1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jan 15 17:25:50 2023 +0000

    10.1.x is no longer the main branch
---
 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 0c6b8eeefe..6ce869941d 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org