[tor-commits] [torbutton/maint-2.0] Bug 28515: Use en-US for english Torbutton strings

[gk at torproject.org]

commit 9abd346f924c8340856c06039876d900a1ca5ac8
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Nov 19 09:20:09 2018 +0000

    Bug 28515: Use en-US for english Torbutton strings
    
    There is no `en` in Mozilla's universe and we need `en-US` for Torbutton
    integration into `tor-browser` (see: #25013). Thus, switch our locale
    code for english in Torbutton accordingly.
    
    The server-side of this switch got done in #28261 and the workaround for
    that, which was symlinking `en` to `en-US`, is not needed anymore.
---
 makexpi.sh                         | 4 ++--
 src/chrome.manifest                | 2 +-
 src/chrome/locale/en               | 1 -
 trans_tools/import-translations.sh | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/makexpi.sh b/makexpi.sh
index aa3e665b..243fbd6b 100755
--- a/makexpi.sh
+++ b/makexpi.sh
@@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ----------
 # create the pkg directory if it doesn't exist yet
 mkdir -p pkg
 cd src
-echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*"
-zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*"
+echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*"
+zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*"
 #mv ../$APP_NAME.jar ./chrome
 #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar
 cd ..
diff --git a/src/chrome.manifest b/src/chrome.manifest
index 18c5f5b9..33199ccf 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -45,7 +45,7 @@ locale torbutton da chrome/locale/da/
 locale torbutton de chrome/locale/de/
 locale torbutton dz chrome/locale/dz/
 locale torbutton el chrome/locale/el/
-locale torbutton en chrome/locale/en/
+locale torbutton en chrome/locale/en-US/
 locale torbutton eo chrome/locale/eo/
 locale torbutton es chrome/locale/es/
 locale torbutton et chrome/locale/et/
diff --git a/src/chrome/locale/en b/src/chrome/locale/en
deleted file mode 120000
index f2b0341f..00000000
--- a/src/chrome/locale/en
+++ /dev/null
@@ -1 +0,0 @@
-en-US
\ No newline at end of file
diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh
index d13f8259..c7fa152e 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -28,7 +28,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd"
 
 # Verify that the FILEMAP contains an entry for each Torbutton file.
 FILES_ARE_MISSING=0
-for DEST_PATH in $LOCALE_DIR/en/*.dtd $LOCALE_DIR/en/*.properties;
+for DEST_PATH in $LOCALE_DIR/en-US/*.dtd $LOCALE_DIR/en-US/*.properties;
 do
   IS_FILE_IN_MAP=0
   DEST_FILE=${DEST_PATH##*/}