Merge branch 'os-recommedations', thx JBB and LNJ

7 files changed, 28 insertions, 7 deletions

diff --git a/clients.json b/clients_Android.json
index 8fbec2b..be4a3ee 100644
--- a/clients.json
+++ b/clients_Android.json
@@ -1,5 +1,6 @@
 [
     "<strong><a href=\"https://play.google.com/store/apps/details?id=org.yaxim.androidclient\">yaxim</a></strong> - lightweight classic UI",
     "<strong><a href=\"https://play.google.com/store/apps/details?id=eu.siacs.conversations\">Conversations</a></strong> - modern and featureful",
+    "<strong><a href=\"https://play.google.com/store/apps/details?id=com.xabber.android\">Xabber</a></strong> - focus on user experience and interoperability",
     "<strong><a href=\"https://play.google.com/store/apps/details?id=org.yaxim.bruno\">Bruno</a></strong> - cute and cuddly (based on yaxim)"
 ]
diff --git a/clients_Linux.json b/clients_Linux.json
new file mode 100644
index 0000000..024ac44
--- /dev/null
+++ b/clients_Linux.json
@@ -0,0 +1,5 @@
+[
+    "<strong><a href=\"https://dino.im/\">Dino</a></strong> - modern, clean and GNOME integrated",
+    "<strong><a href=\"https://git.kaidan.im/kaidan/kaidan\">Kaidan</a></strong> - modern, convergent and cross-platform",
+    "<strong><a href=\"https://gajim.org/\">Gajim</a></strong> - full-featured"
+]
diff --git a/clients_iOS.json b/clients_iOS.json
new file mode 100644
index 0000000..e42c521
--- /dev/null
+++ b/clients_iOS.json
@@ -0,0 +1,4 @@
+[
+    "<strong><a href=\"https://itunes.apple.com/us/app/monal-free-xmpp-chat/id317711500\">Monal</a></strong> - Free client for iOS and macOS",
+    "<strong><a href=\"https://itunes.apple.com/us/app/chatsecure/id464200063\">ChatSecure</a></strong> - Encrypted Messenger for iOS"
+]
diff --git a/lang/de.json b/lang/de.json
index 48ee055..04460fa 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -12,8 +12,8 @@
     "":""
   },
   "clients": "Wenn der Link nicht funktioniert, müssen Sie einen XMPP-Client installieren und einrichten, und dann diese Seite nochmal aufsuchen.",
-  "recommend": "Auf Android empfehlen wir einen von:",
+  "recommend": "Wir empfehlen einen von:",
   "checkfulllist": "Sehen Sie sich die <a href='http://xmpp.org/software/clients.html'>vollständige Liste der XMPP-clients</a> für weitere Plattformen an.",
-  "xmppis": "XMPP ist eine Anbieter-unabhängige From des Instant Messaging.  Sie können sich einen von vielen Clients aussuchen und haben eine freie Auswahl, welchen Server Sie verwenden.",
+  "xmppis": "XMPP ist eine Anbieter-unabhängige Form des Instant Messaging.  Sie können sich einen von vielen Clients aussuchen und haben eine freie Auswahl, welchen Server Sie verwenden.",
   "":""
 }
diff --git a/lang/en.json b/lang/en.json
index ac90f47..5a3c3de 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -12,7 +12,7 @@
     "":""
   },
   "clients": "If this link does not work, you need to install and configure an XMPP client, and visit this page again afterwards.",
-  "recommend": "On Android we recommend one of:",
+  "recommend": "We recommend one of:",
   "checkfulllist": "Check the <a href='http://xmpp.org/software/clients.html'>full list of XMPP clients</a> for other platforms.",
   "xmppis": "XMPP is a provider independent form of instant messaging.  You can pick from many different clients and have a free choice of server operators to participate.",
   "":""
diff --git a/lang/fr.json b/lang/fr.json
index df1b603..0d45a3c 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -12,7 +12,7 @@
     "":""
   },
   "clients": "Si ce lien ne fonctionne pas, vous devez installer et configurer un client XMPP, puis revenir à cette page.",
-  "recommend": "Sur Android nous recommandons un des clients suivants :",
+  "recommend": "Nous recommandons un des clients suivants:",
   "checkfulllist": "Vous pouvez consulter <a href='http://xmpp.org/software/clients.html'>la liste complète des clients XMPP</a> pour les autres plateformes.",
   "xmppis": "XMPP est une forme de messagerie instantanée indépendante du fournisseur. Vous pouvez choisir parmi de nombreux clients et un libre choix d'opérateurs de serveurs pour participer.",
   "":""
diff --git a/scripts/main.js b/scripts/main.js
index 7f9bc8d..cc13762 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -17,8 +17,7 @@
 		}
 	}
 
-	function load_clients() {
-		var url = "clients.json";
+	function load_clients(url) {
 		var request = new XMLHttpRequest();
 		request.open('GET', url);
 		request.onreadystatechange = function () {
@@ -93,7 +92,19 @@
 		i18n.setLocale('en');
 
 		// functionality
-		load_clients();
+		if (navigator.userAgent.indexOf("Android") >= 0) {
+			load_clients("clients_Android.json")
+		}
+		else if (navigator.userAgent.indexOf("Linux") >= 0)  {
+			load_clients("clients_Linux.json")
+		}
+                else if (navigator.userAgent.indexOf("iPhone") >= 0)  {
+                        load_clients("clients_iOS.json")
+                }
+		else {
+			load_clients("clients_Linux.json")
+		}
+
 		window.addEventListener("hashchange", rehash, false);
 		document.getElementById("url_in").addEventListener("focus", function(event) {
 			event.target.select();