Make loading message more generic

Refactor name so the loading code can be used elsewhere without confusion
adapt-it · Aug 21, 2015 · 1bfc397 · 1bfc397
1 parent bae051f
commit 1bfc397
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/www/js/views/AdaptViews.js b/www/js/views/AdaptViews.js
@@ -17,7 +17,7 @@ define(function (require) {
         chapterModel = require('app/models/chapter'),
         bookModel   = require('app/models/book'),
         tplChapter  = require('text!tpl/Chapter.html'),
-        tplEmptySPList = require('text!tpl/EmptySPList.html'),
+        tplLoadingPleaseWait = require('text!tpl/LoadingPleaseWait.html'),
         tplSourcePhraseList = require('text!tpl/SourcePhraseList.html'),
         tplSourcePhrase = require('text!tpl/SourcePhrase.html'),
         kblist      = null, // real value passed in constructor
@@ -134,7 +134,7 @@ define(function (require) {
             },
             render: function () {
                 if (this.collection.length === 0) {
-                    template = Handlebars.compile(tplEmptySPList);
+                    template = Handlebars.compile(tplLoadingPleaseWait);
                     this.$el.html(template());
                 } else {
                     // add the collection

diff --git a/www/locales/dev/translation.json b/www/locales/dev/translation.json
@@ -175,7 +175,7 @@
         "dscAdaptComplete": "Adaptation of __chapter__ complete.",
         "dscAdaptContinue": "Adaptation of __chapter__ complete. Continue to the next chapter?",
         "errEnterLanguageName": "Please enter a language name.",
-        "ttlLoadingChapter": "Loading... please wait.",
+        "ttlLoading": "Loading... please wait.",
         "ttlFilteredText": "Filtered Text",
         "dscFilterMarker": "USFM marker: ",
         "dscFilteredText": "Text for filtered marker: ",

diff --git a/www/locales/en/translation.json b/www/locales/en/translation.json
@@ -175,7 +175,7 @@
         "dscAdaptComplete": "Adaptation of __chapter__ complete.",
         "dscAdaptContinue": "Adaptation of __chapter__ complete. Continue to the next chapter?",
         "errEnterLanguageName": "Please enter a language name.",
-        "ttlLoadingChapter": "Loading... please wait.",
+        "ttlLoading": "Loading... please wait.",
         "ttlFilteredText": "Filtered Text",
         "dscFilterMarker": "USFM marker: ",
         "dscFilteredText": "Text for filtered marker: ",

diff --git a/www/locales/es/translation.json b/www/locales/es/translation.json
@@ -175,7 +175,7 @@
         "dscAdaptComplete": "Traducción de __chapter__ se ha completado.",
         "dscAdaptContinue": "Traducción de __chapter__ se ha completado. ¿Quiere continuar con el siguiente capítulo?",
         "errEnterLanguageName": "Por favor escriba el nombre de una idioma.",
-        "ttlLoadingChapter": "Espere un momento, por favor.",
+        "ttlLoading": "Espere un momento, por favor.",
         "ttlFilteredText": "Texto filtrada",
         "dscFilterMarker": "Marcador USFM: ",
         "dscFilteredText": "Texto: ",

diff --git a/www/locales/fr/translation.json b/www/locales/fr/translation.json
@@ -175,7 +175,7 @@
         "dscAdaptComplete": "Traduction de __chapter__ est maintenant terminée.",
         "dscAdaptContinue": "Traduction de __chapter__ est maintenant terminée. Voulez-vous continuer à le prochain chapitre?",
         "errEnterLanguageName": "S'il vous plaît taper un nom de langue.",
-        "ttlLoadingChapter": "Chargement ... s'il vous plaît patienter.",
+        "ttlLoading": "Chargement ... s'il vous plaît patienter.",
         "ttlFilteredText": "Texte filtré",
         "dscFilterMarker": "USFM marqueur: ",
         "dscFilteredText": "Texte: ",

diff --git a/www/locales/tpi/translation.json b/www/locales/tpi/translation.json
@@ -175,7 +175,7 @@
         "dscAdaptComplete": "Yu pinis trenslesen: __chapter__.",
         "dscAdaptContinue": "Yu pinis trenslesen: __chapter__. Yu laik opim neks sapta?",
         "errEnterLanguageName": "Plis taipim tokples nem.",
-        "ttlLoadingChapter": "Ritim - plis wet.",
+        "ttlLoading": "Ritim - plis wet.",
         "ttlFilteredText": "Filta (hait) teks",
         "dscFilterMarker": "Maka: ",
         "dscFilteredText": "Teks bilong maka: ",

diff --git a/www/tpl/EmptySPList.html → www/tpl/LoadingPleaseWait.html b/www/tpl/EmptySPList.html → www/tpl/LoadingPleaseWait.html
@@ -1,6 +1,6 @@
 <div class="vertcenter">
     <div class="welcome-title">
-        <h3>{{ t 'view.ttlLoadingChapter'}}</h3>
+        <h3>{{ t 'view.ttlLoading'}}</h3>
         <div class="waiting"></div>
     </div>
 </div>