Fix i18n

kubernetes · Feb 28, 2020 · d086e20 · d086e20
1 parent bb1b922
commit d086e20
Show file tree

Hide file tree

Showing 22 changed files with 12,474 additions and 1,993 deletions.
diff --git a/aio/scripts/build.sh b/aio/scripts/build.sh
@@ -29,31 +29,13 @@ function clean {
 }
 
 function build::frontend {
-  say "\nBuilding frontend for default locale: en"
-  mkdir -p ${FRONTEND_DIR}/en
-  ${NG_BIN} build --aot --prod --outputPath=${TMP_DIR}/frontend/en
-
-  languages=($(find i18n/* -type d|cut -d"/" -f2))
-  ignores=()
-  if [[ -f "i18n/locale_not_for_build_local" ]]; then
-    # Add locales to ignore on local setting file.
-    ignores=($(cat i18n/locale_not_for_build_local))
-  fi
-  for language in "${languages[@]}"; do
-    if [[ " ${ignores[@]} " =~ " ${language} " ]]; then
-      say "Skip building locale: ${language}"
-      continue
-    fi
-
-    mkdir -p ${FRONTEND_DIR}/${language}
-
-    say "Building frontend for locale: ${language}"
-    ${NG_BIN} build --aot \
-                    --prod \
-                    --i18nFile=${I18N_DIR}/${language}/messages.${language}.xlf \
-                    --i18nFormat=xlf \
-                    --i18nLocale=${language} --outputPath=${TMP_DIR}/frontend/${language}
-  done
+  say "\nBuilding localized frontend"
+  mkdir -p ${FRONTEND_DIR}
+  ${NG_BIN} build \
+            --aot \
+            --prod \
+            --localize \
+            --outputPath=${FRONTEND_DIR}
 }
 
 function build::backend {

diff --git a/aio/tsconfig.app.json b/aio/tsconfig.app.json
@@ -6,10 +6,6 @@
     "target": "es5",
     "types": ["node"]
   },
-  "files": [
-    "../src/app/frontend/index.ts",
-    "../src/app/frontend/polyfills.ts"
-  ],
   "include": [
     "../src/app/frontend/**/*"
   ],

diff --git a/aio/tsconfig.spec.json b/aio/tsconfig.spec.json
@@ -10,7 +10,6 @@
     ]
   },
   "files": [
-    "../src/app/frontend/index.spec.ts",
     "../src/app/frontend/polyfills.ts"
   ],
   "include": [

diff --git a/angular.json b/angular.json
@@ -7,6 +7,42 @@
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
+      "i18n": {
+        "sourceLocale": {
+          "code": "en",
+          "baseHref": "/"
+        },
+        "locales": {
+          "de": {
+            "translation": "i18n/de/messages.de.xlf",
+            "baseHref": "/"
+          },
+          "fr": {
+            "translation": "i18n/fr/messages.fr.xlf",
+            "baseHref": "/"
+          },
+          "ja": {
+            "translation": "i18n/ja/messages.ja.xlf",
+            "baseHref": "/"
+          },
+          "ko": {
+            "translation": "i18n/ko/messages.ko.xlf",
+            "baseHref": "/"
+          },
+          "zh": {
+            "translation": "i18n/zh/messages.zh.xlf",
+            "baseHref": "/"
+          },
+          "zh-Hans": {
+            "translation": "i18n/zh-Hans/messages.zh-Hans.xlf",
+            "baseHref": "/"
+          },
+          "zh-Hant": {
+            "translation": "i18n/zh-Hant/messages.zh-Hant.xlf",
+            "baseHref": "/"
+          }
+        }
+      },
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,6 +53,7 @@
             "main": "src/app/frontend/index.ts",
             "tsConfig": "src/app/frontend/../../../aio/tsconfig.app.json",
             "polyfills": "src/app/frontend/polyfills.ts",
+            "i18nMissingTranslation": "error",
             "assets": [
               {
                 "glob": "**/*",

diff --git a/i18n/locale_conf.json b/i18n/locale_conf.json
@@ -1 +1 @@
-{"translations": [ "de", "en", "fr", "ja", "ko", "zh", "zh-cn", "zh-hk", "zh-sg", "zh-tw" ]}
+{"translations": [ "de", "en", "fr", "ja", "ko", "zh", "zh-Hans", "zh-Hant-HK", "zh-Hans-SG", "zh-Hant" ]}
diff --git a/i18n/messages.xlf b/i18n/messages.xlf
diff --git a/i18n/zh-cn/OWNERS → i18n/zh-Hans-SG/OWNERS b/i18n/zh-cn/OWNERS → i18n/zh-Hans-SG/OWNERS
diff --git a/i18n/zh-Hans-SG/messages.zh-Hans-SG.xlf b/i18n/zh-Hans-SG/messages.zh-Hans-SG.xlf
diff --git a/i18n/zh-hk/OWNERS → i18n/zh-Hans/OWNERS b/i18n/zh-hk/OWNERS → i18n/zh-Hans/OWNERS
diff --git a/i18n/zh-Hans/messages.zh-Hans.xlf b/i18n/zh-Hans/messages.zh-Hans.xlf
diff --git a/i18n/zh-sg/OWNERS → i18n/zh-Hant-HK/OWNERS b/i18n/zh-sg/OWNERS → i18n/zh-Hant-HK/OWNERS
diff --git a/i18n/zh-hk/messages.zh-hk.xlf → i18n/zh-Hant-HK/messages.zh-Hant-HK.xlf b/i18n/zh-hk/messages.zh-hk.xlf → i18n/zh-Hant-HK/messages.zh-Hant-HK.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-  <file source-language="en" datatype="plaintext" original="ng2.template" target-language="zh-hk">
+  <file source-language="en" datatype="plaintext" original="ng2.template" target-language="zh-Hant-HK">
     <body>
       <trans-unit id="70cd6a0cff2699d1c553c292ae76f41bb3b8e0de" datatype="html">
         <source>Edit a resource</source>

diff --git a/i18n/zh-tw/OWNERS → i18n/zh-Hant/OWNERS b/i18n/zh-tw/OWNERS → i18n/zh-Hant/OWNERS
diff --git a/i18n/zh-tw/messages.zh-tw.xlf → i18n/zh-Hant/messages.zh-Hant.xlf b/i18n/zh-tw/messages.zh-tw.xlf → i18n/zh-Hant/messages.zh-Hant.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-  <file source-language="en" datatype="plaintext" original="ng2.template" target-language="zh-tw">
+  <file source-language="en" datatype="plaintext" original="ng2.template" target-language="zh-Hant">
     <body>
       <trans-unit id="70cd6a0cff2699d1c553c292ae76f41bb3b8e0de" datatype="html">
         <source>Edit a resource</source>

diff --git a/i18n/zh-cn/messages.zh-cn.xlf b/i18n/zh-cn/messages.zh-cn.xlf
diff --git a/i18n/zh-sg/messages.zh-sg.xlf b/i18n/zh-sg/messages.zh-sg.xlf
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"translations": [ "de", "en", "fr", "ja", "ko", "zh", "zh-cn", "zh-hk", "zh-sg", "zh-tw" ]}
		{"translations": [ "de", "en", "fr", "ja", "ko", "zh", "zh-Hans", "zh-Hant-HK", "zh-Hans-SG", "zh-Hant" ]}