From 449e862c933a2fa5fb192044ebdb31301567cad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Oestreicher?= <greg@kamago.net>
Date: Tue, 20 Dec 2016 15:21:23 +0100
Subject: [PATCH] Make errors in WallaBase.js translatable

---
 qml/js/WallaBase.js                  | 20 ++++++++++----------
 translations/harbour-wallaread-fr.ts | 19 +++++++++++++++++++
 translations/harbour-wallaread.ts    | 19 +++++++++++++++++++
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/qml/js/WallaBase.js b/qml/js/WallaBase.js
index 6c95798..c3f831b 100644
--- a/qml/js/WallaBase.js
+++ b/qml/js/WallaBase.js
@@ -97,7 +97,7 @@ function getServer( id, cb )
             try {
                 var res = tx.executeSql( "SELECT id, name, url, lastSync FROM servers WHERE id=?", [ id ] );
                 if ( res.rows.length === 0 ) {
-                    err = "No server with this ID found";
+                    err = qsTr( "Server not found in the configuration" );
                 }
                 else {
                     server = res.rows.item( 0 );
@@ -123,7 +123,7 @@ function getServerSettings( id, cb )
             try {
                 var res = tx.executeSql( "SELECT * FROM servers WHERE id=?", [ id ] );
                 if ( res.rows.length === 0 ) {
-                    err = "No server with this ID found";
+                    err = qsTr( "Server not found in the configuration" );
                 }
                 else {
                     server = res.rows.item( 0 );
@@ -224,7 +224,7 @@ function connectToServer( id, cb )
             try {
                 var res = tx.executeSql( "SELECT url, user, password, clientId, clientSecret FROM servers WHERE id=?", [ id ] );
                 if ( res.rows.length === 0 ) {
-                    err = "No server with ID " + id + " found";
+                    err = qsTr( "Server not found in the configuration" );
                 }
                 else {
                     _sendAuthRequest( res.rows.item( 0 ), cb );
@@ -267,7 +267,7 @@ function _sendAuthRequest( props, cb )
                 }
                 catch( e ) {
                     json = null;
-                    err = "Failed to parse server response: " + e.message
+                    err = qsTr( "Failed to parse server response: " ) + e.message
                 }
             }
             else {
@@ -280,7 +280,7 @@ function _sendAuthRequest( props, cb )
                     }
                 }
 
-                err = "HTTP request failed: " + http.status;
+                err = qsTr( "Server reply was " ) + "'" + http.statusText + "'";
             }
 
             cb( json, err );
@@ -424,7 +424,7 @@ function articleExists( server, id, cb )
                     exists = ( res.rows[0].count === 0 ? false : true );
                 }
                 else {
-                    err = "Failed to get article from database when checking its existence";
+                    err = qsTr( "Article not found in the cache" );
                 }
             }
             catch( e ) {
@@ -548,7 +548,7 @@ function uploadNewArticle( props, articleUrl, cb )
                 }
                 catch( e ) {
                     json = null;
-                    err = "failed to parse server response";
+                    err = qsTr( "Failed to parse server response: " ) + e.message;
                 }
 
                 if ( err !== null )
@@ -563,7 +563,7 @@ function uploadNewArticle( props, articleUrl, cb )
                     )
             }
             else {
-                err = "server returned '" + http.statusText + "'";
+                err = qsTr( "Server reply was " ) + "'" + http.statusText + "'";
             }
 
             cb( json, err );
@@ -634,7 +634,7 @@ function _downloadNextArticles( url, token, page, cb )
                 }
                 catch( e ) {
                     json = null;
-                    err = "Failed to parse server response: " + e.message
+                    err = qsTr( "Failed to parse server response: " ) + e.message
                 }
             }
             else {
@@ -647,7 +647,7 @@ function _downloadNextArticles( url, token, page, cb )
                     }
                 }
 
-                err = "HTTP request failed: " + http.status;
+                err = qsTr( "Server reply was " ) + "'" + http.statusText + "'";
             }
 
             cb( articles, done, err );
diff --git a/translations/harbour-wallaread-fr.ts b/translations/harbour-wallaread-fr.ts
index 84662f5..f224d00 100644
--- a/translations/harbour-wallaread-fr.ts
+++ b/translations/harbour-wallaread-fr.ts
@@ -169,4 +169,23 @@
         <translation>Aucun serveur trouvé, utilisez le menu coulissant et sélectionnez &apos;Nouveau serveur&apos;</translation>
     </message>
 </context>
+<context>
+    <name>WallaBase</name>
+    <message>
+        <source>Server not found in the configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to parse server response: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server reply was </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Article not found in the cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/translations/harbour-wallaread.ts b/translations/harbour-wallaread.ts
index 781bd79..b7e5b91 100644
--- a/translations/harbour-wallaread.ts
+++ b/translations/harbour-wallaread.ts
@@ -169,4 +169,23 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WallaBase</name>
+    <message>
+        <source>Server not found in the configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to parse server response: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server reply was </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Article not found in the cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>