Merge pull request #648 from zanata/shortcuts

Merge zanata-spa 0.0.6
zanata · Jan 13, 2015 · a53a419 · a53a419
2 parents 1bdb992 + a5dc199
commit a53a419
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 30 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -207,6 +207,7 @@ private List<TranslationResult> translate(LocaleId localeId,
                     log.warn(validationMessage);
                     result.isSuccess = false;
                     result.errorMessage = validationMessage;
+                    results.add(result);
                     continue;
                 }
             }

diff --git a/zanata-war/src/main/webapp/app/config.json b/zanata-war/src/main/webapp/app/config.json
@@ -1,3 +1,4 @@
 {
+
   "appPath": "/app"
 }
diff --git a/zanata-war/src/main/webapp/app/css/app.css b/zanata-war/src/main/webapp/app/css/app.css
diff --git a/zanata-war/src/main/webapp/app/css/libs.css b/zanata-war/src/main/webapp/app/css/libs.css
diff --git a/zanata-war/src/main/webapp/app/js/app.js b/zanata-war/src/main/webapp/app/js/app.js
diff --git a/zanata-war/src/main/webapp/app/js/libs.js b/zanata-war/src/main/webapp/app/js/libs.js
diff --git a/zanata-war/src/main/webapp/app/js/templates.js b/zanata-war/src/main/webapp/app/js/templates.js
diff --git a/zanata-war/src/main/webapp/app/maps/app.js.map b/zanata-war/src/main/webapp/app/maps/app.js.map
diff --git a/zanata-war/src/main/webapp/app/maps/libs.js.map b/zanata-war/src/main/webapp/app/maps/libs.js.map
diff --git a/zanata-war/src/main/webapp/app/translations/de.json b/zanata-war/src/main/webapp/app/translations/de.json
@@ -1 +1 @@
-{"de":{"Approved":"Genehmigt","Details":"Details","Editor Settings":"Editor -Einstellungen","Filters":"Filter","Fuzzy":"Unscharf","Glossary":"Glossar","Hide Menubar":"Menüleiste ausblenden","More":"Mehr","More filters":"Mehr Filter","Notifications":"Benachrichtigungen","Search":"Suche","Settings":"Einstellungen","Total Phrases":"Gesamt Sätze","Translated":"Traduit","Translating":"übersetzt","Translation Memory":"Translation Memory","Untranslated":"Untranslatierten"}}
+{"de":{"Approved":"Genehmigt","Details":"Details","Editor Settings":"Editor -Einstellungen","Filters":"Filter","Fuzzy":"Unscharf","Glossary":"Glossar","Hide Menubar":"Menüleiste ausblenden","More":"Mehr","More filters":"Mehr Filter","Notifications":"Benachrichtigungen","Search":"Suche","Settings":"Einstellungen","Total Phrases":"Gesamt Sätze","Translated":"Traduit","Translating":"übersetzt","Translation Memory":"Translation Memory","Untranslated":"Untranslatierten"}}
diff --git a/zanata-war/src/main/webapp/app/translations/fr.json b/zanata-war/src/main/webapp/app/translations/fr.json
@@ -1 +1 @@
-{"fr":{"Approved":"Approuvé","Details":"Détails","Editor Settings":"Paramètres de l'éditeur","Filters":"Filtres","Fuzzy":"Flou","Glossary":"Glossaire","Hide Menubar":"Cacher la barre de menus","More":"Plus","More filters":"Plus de filtres","Notifications":"Notifications","Search":"Recherche","Settings":"Paramètres","Total Phrases":"Total des phrases","Translated":"Traduit","Translating":"Traduire","Translation Memory":"Mémoire de traduction","Untranslated":"Non traduite"}}
+{"fr":{"Approved":"Approuvé","Details":"Détails","Editor Settings":"Paramètres de l'éditeur","Filters":"Filtres","Fuzzy":"Flou","Glossary":"Glossaire","Hide Menubar":"Cacher la barre de menus","More":"Plus","More filters":"Plus de filtres","Notifications":"Notifications","Search":"Recherche","Settings":"Paramètres","Total Phrases":"Total des phrases","Translated":"Traduit","Translating":"Traduire","Translation Memory":"Mémoire de traduction","Untranslated":"Non traduite"}}