Merge branch 'develop' of github.com:shprink/wordpress-hybrid-client …

…into feature/wp-api_v2
wordpress-clients · Sep 28, 2015 · 8b1bc0c · 8b1bc0c
2 parents b2fcf9b + 7e97a57
commit 8b1bc0c
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="1.6.0"></a>
+### 1.7.0 (WIP)
+
+[milestone](https://github.com/shprink/wordpress-hybrid-client/milestones/1.7.0)
+
+* WP-API v2 support <https://github.com/shprink/wordpress-hybrid-client/issues/76>
+* Adding German translation <https://github.com/shprink/wordpress-hybrid-client/pull/77>
+
 <a name="1.6.0"></a>
 ### 1.6.0 (2015-09-24)
 

diff --git a/README.md b/README.md
@@ -103,14 +103,15 @@ Always use four spaces, no tabs. This goes for any HTML, CSS, or Javascript.
 - [X] Overwrite Sass variables
 - [X] About Page
 - [X] Params Page
-- [X] Language switch [English|French|Chinese]
+- [X] Language switch [English|French|Chinese|Spanish|Polish|German]
 - [X] Accessibility (Post font size)
 - [X] Image cache ngImgCache
 - [X] App rate
 - [X] Syntax highlighter for tech blogs
 - [X] Push Notifications
 - [X] Offline
 - [X] Comments. Submitting is not supported yet.
+- [X] iOS9 support.
 - [ ] Table of content for posts
 - [ ] Personnalized Logo
 - [ ] Templating

diff --git a/config.json.dist b/config.json.dist
@@ -171,6 +171,9 @@
             },
             "pl": {
                 "pl_*": "pl"
+            },
+            "de": {
+                "de_*": "de"
             }
         },
         "prefered": "en"

diff --git a/lib/translations/de.json b/lib/translations/de.json
@@ -0,0 +1,87 @@
+{
+    "pullToRefresh": "Ziehen zum Aktualisieren!",
+    "retry": "Wiederholen",
+    "back": "Zurück",
+    "error": "Etwas ging schief. Bitte erneut versuchen.",
+    "attemptToConnect": "Verbinden: Versuch(e) {{attempt}} von {{attemptMax}}.",
+    "yes": "Ja",
+    "no" : "Nein",
+    "menu": {
+        "title": "Menü",
+        "home": "Startseite",
+        "tags": "Tags",
+        "search": "Suche",
+        "bookmarks": "Lesezeichen",
+        "socialNetworks": "Soziale Netzwerke",
+        "categories": "Kategorien",
+        "settings": "Einstellungen"
+    },
+    "pushNotifications": {
+        "newContent": {
+            "title": "Neue Inhalte!",
+            "text": "Neu! Seite/Beitrag: '{{postTitle}}' wurde in {{appTitle}} veröffentlich, willst du es dir jetzt ansehen?"
+        }
+    },
+    "bookmark": {
+        "title": "Lesenzeichen",
+        "emptyList" : "Bisher noch nichts gespeichert!",
+        "bookmarked" : "Lesezeichen gespeichert!",
+        "removed" : "Lesezeichen gelöscht!"
+    },
+    "tags": {
+        "title": "Tags"
+    },
+    "tag": {
+        "title": "Tag: {{name}}"
+    },
+    "categories": {
+        "title": "Kategorien"
+    },
+    "category": {
+        "title": "Kategorie: {{name}}"
+    },
+    "home": {
+        "title": "Startseite"
+    },
+    "search": {
+        "inputPlaceholder": "Suche",
+        "title": "Suche",
+        "titleQuery": "Suche: {{query}}"
+    },
+    "sharing": {
+        "shared": "Geteilt!"
+    },
+    "posts": {
+        "title": "Startseite",
+        "empty": "Keine Inhalte bisher!",
+        "featured": "Hervorgehoben"
+    },
+    "post": {
+        "comments": "Kommentare",
+        "openInBrowser": "Im Browser öffnen"
+    },
+    "about": {
+        "title": "Über"
+    },
+    "params": {
+        "title": "Einstellungen",
+        "offlineMode": "Offline Modus (bald)",
+        "fontSize": "Schriftgröße der Beiträge",
+        "language": "Sprache"
+    },
+    "languages": {
+        "de": "Deutsch",
+        "en": "English",
+        "fr": "Französisch",
+        "zh": "Chinesich",
+        "es": "Spanisch",
+        "pl": "Polnisch"
+    },
+    "fontSize": {
+        "small": "Klein",
+        "medium": "Mittel",
+        "large": "Groß",
+        "x-large": "Größer",
+        "xx-large": "Extra Groß"
+    }
+}
diff --git a/lib/translations/en.json b/lib/translations/en.json
@@ -74,7 +74,8 @@
         "fr": "French",
         "zh": "Chinese",
         "es": "Spanish",
-        "pl": "Polish"
+        "pl": "Polish",
+        "de": "German"
     },
     "fontSize": {
         "small": "Small",

diff --git a/lib/translations/es.json b/lib/translations/es.json
@@ -72,8 +72,9 @@
         "en": "English",
         "fr": "French",
         "zh": "Chinese",
-	"es": "Spanish",
-	"pl": "Polaco"
+	    "es": "Spanish",
+	    "pl": "Polaco",
+        "de": "Alemán"
     },
     "fontSize": {
         "small": "Pequeña",

diff --git a/lib/translations/fr.json b/lib/translations/fr.json
@@ -74,7 +74,8 @@
         "fr": "Français",
         "zh": "Chinois",
         "es": "Espagnol",
-        "pl": "Polonais"
+        "pl": "Polonais",
+        "de": "Allemand"
     },
     "fontSize": {
         "small": "Petit",

diff --git a/lib/translations/pl.json b/lib/translations/pl.json
@@ -74,7 +74,8 @@
         "fr": "French",
         "zh": "Chinese",
         "es": "Spanish",
-        "pl": "Polski"
+        "pl": "Polski",
+        "de": "Niemiecki"
     },
     "fontSize": {
         "small": "Mała",

diff --git a/lib/translations/zh.json b/lib/translations/zh.json
@@ -74,7 +74,8 @@
         "fr": "法语",
         "zh": "中文",
         "es": "西班牙语",
-        "pl": "波兰语"
+        "pl": "波兰语",
+        "de": "德语"
     },
     "fontSize": {
         "small": "小",
-Original file line number
+Diff line change
@@ Expand Up / @@ -171,6 +171,9 @@ @@
                 },
                 "pl": {
                     "pl_*": "pl"
+                },
+                "de": {
+                    "de_*": "de"
                 }
             },
             "prefered": "en"
@@ Expand Down @@