From 6959b1849f5bae6be8f560746b3201d640f187b2 Mon Sep 17 00:00:00 2001
From: Adam Mills <adam@armills.info>
Date: Sat, 4 Nov 2017 00:31:22 -0400
Subject: [PATCH] Store language native names in git (#556)

* Don't delete the gitignore file

* Store translation native names in git
---
 gulp/tasks/translations.js                | 27 +--------
 script/translations_download              |  2 +-
 src/translations/en.json                  | 26 --------
 src/translations/translationMetadata.json | 74 +++++++++++++++++++++++
 4 files changed, 77 insertions(+), 52 deletions(-)
 create mode 100644 src/translations/translationMetadata.json

diff --git a/gulp/tasks/translations.js b/gulp/tasks/translations.js
index deefdfc5d0..6cedd768e1 100755
--- a/gulp/tasks/translations.js
+++ b/gulp/tasks/translations.js
@@ -29,22 +29,6 @@ function flatten (data) {
   return recursive_flatten('', data);
 }
 
-var taskName = 'build-translation-native-names';
-gulp.task(taskName, function() {
-  return gulp.src(inDir + '/*.json')
-    .pipe(transform(function(data, file) {
-      // Look up the native name for each language and generate a json
-      // object with all available languages and native names
-      const lang = path.basename(file.relative, '.json');
-      return {[lang]: {nativeName: data.language[lang]}};
-    }))
-    .pipe(merge({
-      fileName: 'translationNativeNames.json',
-    }))
-    .pipe(gulp.dest('build-temp'));
-});
-tasks.push(taskName);
-
 var taskName = 'build-merged-translations';
 gulp.task(taskName, function () {
   return gulp.src(inDir + '/*.json')
@@ -63,13 +47,6 @@ gulp.task(taskName, function () {
         .pipe(merge({
           fileName: tr + '.json',
         }))
-        .pipe(transform(function(data, file) {
-          // For now, language strings are only used for the native names list. We're deleting
-          // them from the rolled up translation files for now until we have a more robust
-          // system for splitting translation strings into multiple resource files.
-          delete data['language'];
-          return data;
-        }))
         .pipe(transform(function(data, file) {
           // Polymer.AppLocalizeBehavior requires flattened json
           return flatten(data);
@@ -103,10 +80,10 @@ gulp.task(taskName, ['build-merged-translations'], function() {
 tasks.push(taskName);
 
 var taskName = 'build-translations';
-gulp.task(taskName, ['build-translation-fingerprints', 'build-translation-native-names'], function() {
+gulp.task(taskName, ['build-translation-fingerprints'], function() {
   return gulp.src([
+      'src/translations/translationMetadata.json',
       'build-temp/translationFingerprints.json',
-      'build-temp/translationNativeNames.json',
     ])
     .pipe(merge({}))
     .pipe(transform(function(data, file) {
diff --git a/script/translations_download b/script/translations_download
index be28687620..a1aaea0b4e 100755
--- a/script/translations_download
+++ b/script/translations_download
@@ -21,7 +21,7 @@ LOCAL_DIR="$(pwd)/translations"
 DOWNLOAD_FILE="${LOCAL_DIR}/Home_Assistant_-_Polymer_frontend-locale.zip"
 FILE_FORMAT=json
 
-rm -rf ${LOCAL_DIR}
+rm -f ${LOCAL_DIR}/*.json
 mkdir -p ${LOCAL_DIR}
 
 docker run \
diff --git a/src/translations/en.json b/src/translations/en.json
index a4cc531d54..68268498b2 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1,30 +1,4 @@
 {
-  "language": {
-    "bg": "Bulgarian",
-    "cs": "Czech",
-    "da": "Danish",
-    "de": "German",
-    "el": "Greek",
-    "en": "English",
-    "fa": "Persian",
-    "fi": "Finnish",
-    "fr": "French",
-    "hu": "Hungarian",
-    "it": "Italian",
-    "ja": "Japanese",
-    "lt": "Lithuanian",
-    "nl": "Dutch",
-    "no": "Norwegian",
-    "pl": "Polish",
-    "pt": "Portuguese",
-    "ru": "Russian",
-    "sv": "Swedish",
-    "th": "Thai",
-    "tr": "Turkish",
-    "vi": "Vietnamese",
-    "zh-Hans": "Chinese Simplified",
-    "zh-Hant": "Chinese Traditional"
-  },
   "panel": {
     "config": "Configuration",
     "states": "Overview",
diff --git a/src/translations/translationMetadata.json b/src/translations/translationMetadata.json
new file mode 100644
index 0000000000..e2cd31aa44
--- /dev/null
+++ b/src/translations/translationMetadata.json
@@ -0,0 +1,74 @@
+{
+	"bg": {
+		"nativeName": "Български"
+	},
+	"cs": {
+		"nativeName": "Čeština"
+	},
+	"da": {
+		"nativeName": "Dansk"
+	},
+	"de": {
+		"nativeName": "Deutsch"
+	},
+	"el": {
+		"nativeName": "Ελληνικά"
+	},
+	"en": {
+		"nativeName": "English"
+	},
+	"fa": {
+		"nativeName": "فارسی"
+	},
+	"fi": {
+		"nativeName": "Suomi"
+	},
+	"fr": {
+		"nativeName": "Français"
+	},
+	"hu": {
+		"nativeName": "Magyar"
+	},
+	"it": {
+		"nativeName": "Italiano"
+	},
+	"ja": {
+		"nativeName": "日本語"
+	},
+	"lt": {
+		"nativeName": "Lietuvių"
+	},
+	"nl": {
+		"nativeName": "Nederlands"
+	},
+	"no": {
+		"nativeName": "Norsk"
+	},
+	"pl": {
+		"nativeName": "Polski"
+	},
+	"pt": {
+		"nativeName": "Português"
+	},
+	"ru": {
+		"nativeName": "Русский"
+	},
+	"sv": {
+		"nativeName": "Svenska"
+	},
+	"th": {
+		"nativeName": "ภาษาไทย"
+	},
+	"tr": {
+		"nativeName": "Türkçe"
+	},
+	"vi": {
+		"nativeName": "Tiếng Việt"
+	},
+	"zh-Hans": {
+		"nativeName": "简体中文"
+	},
+	"zh-Hant": {
+		"nativeName": "繁體中文"
+	}
+}
\ No newline at end of file