From 5ac68c3f721d6897dda45ec27c5bc1056bd4419e Mon Sep 17 00:00:00 2001 From: leetxyz Date: Thu, 15 Aug 2019 18:09:30 +0200 Subject: [PATCH] GUACAMOLE-699: Fix language ordering, add de.json to auth-jdbc-*, fix intendation --- .../guacamole-auth-cas/src/main/resources/guac-manifest.json | 4 ++-- .../guacamole-auth-duo/src/main/resources/guac-manifest.json | 4 ++-- .../src/main/resources/guac-manifest.json | 1 + .../src/main/resources/guac-manifest.json | 1 + .../src/main/resources/guac-manifest.json | 1 + .../guacamole-auth-ldap/src/main/resources/guac-manifest.json | 1 + .../src/main/resources/guac-manifest.json | 4 ++-- .../src/main/resources/guac-manifest.json | 4 ++-- .../src/main/resources/guac-manifest.json | 4 ++-- .../guacamole-auth-totp/src/main/resources/guac-manifest.json | 4 ++-- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json index b8ce7c721..d261fddfa 100644 --- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json @@ -10,8 +10,8 @@ ], "translations" : [ - "translations/en.json", - "translations/de.json" + "translations/de.json", + "translations/en.json" ], "js" : [ diff --git a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json index 4aab68227..2f0f8f355 100644 --- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json @@ -10,8 +10,8 @@ ], "translations" : [ - "translations/en.json", - "translations/de.json" + "translations/de.json", + "translations/en.json" ], "js" : [ diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json index 7fb613c0d..c9310c6a9 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json @@ -19,6 +19,7 @@ ], "translations" : [ + "translations/de.json", "translations/en.json", "translations/es.json", "translations/fr.json", diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json index b4047bcc3..b4cce47ad 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json @@ -19,6 +19,7 @@ ], "translations" : [ + "translations/de.json", "translations/en.json", "translations/es.json", "translations/fr.json", diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json index c7a0caad0..0641c6595 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json @@ -19,6 +19,7 @@ ], "translations" : [ + "translations/de.json", "translations/en.json", "translations/es.json", "translations/fr.json", diff --git a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json index 2d4d090bf..52b2d417b 100644 --- a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json @@ -10,6 +10,7 @@ ], "translations" : [ + "translations/de.json", "translations/en.json" ] diff --git a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json index 038f4b120..f81f60260 100644 --- a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json @@ -10,8 +10,8 @@ ], "translations" : [ - "translations/en.json", - "translations/de.json" + "translations/de.json", + "translations/en.json" ], "js" : [ diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json index 9900a1638..8ec160540 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json @@ -21,8 +21,8 @@ ], "translations" : [ - "translations/en.json", - "translations/de.json" + "translations/de.json", + "translations/en.json" ], "resources" : { diff --git a/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json index 415f36b3f..4d3bbead1 100644 --- a/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json @@ -10,8 +10,8 @@ ], "translations" : [ - "translations/en.json", - "translations/de.json" + "translations/de.json", + "translations/en.json" ], "js" : [ diff --git a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json index 8c3c6f8af..e57a0e744 100644 --- a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json @@ -10,8 +10,8 @@ ], "translations" : [ - "translations/en.json", - "translations/de.json" + "translations/de.json", + "translations/en.json" ], "js" : [