update L10n for the skin/branding changes, make default operator name be 'Example...

diff --git a/README.md b/README.md
index fcc464089273818dae394fd5294bc2fdc8e8aaf6..37346a209cf7a30f604b71141db916de032b11c5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -20,6 +20,8 @@ The system of having a nonce saved on disk in addition to the salt that is inclu
 
 If you want to use Piwik with this service, either install it via composer or use a distribution-provided package and point the Apache config and settings to it.
 
+The default skin of the service is intentionally very generic. To create your own skin, copy the app/skin/default folder to a new folder next ot it (matching the skin name you put into settings) and adapt the files contained in there. Right now the SVG file is unused and you don't need it but in the future it may get used.
+
 When using it as an OAuth2 provider for login to another site, here are the important endpoints:
 * /authorize --- authentication, call with ?response_type=code&client_id=...&state=...&scope=...&redirect_uri=... - only response_type=code is supported right now (will display HTML form to user and send JSON to redirect_uri).
 * /token --- fetch token, this is both for getting access tokens and refresh tokens (as usual).

diff --git a/app/authutils.php-class b/app/authutils.php-class
index d901669320cf86d946e673ee0b7ed43e03ca011a..65c7afd16304e564c6edd9ad744c14152793a224 100755 (executable)
--- a/app/authutils.php-class
+++ b/app/authutils.php-class
@@ -124,7 +124,7 @@ class AuthUtils {
     $this->settings['piwik_url'] = strlen(@$this->settings['piwik_url']) ? $this->settings['piwik_url'] : '/piwik/';
     $this->settings['piwik_tracker_path'] = strlen(@$this->settings['piwik_tracker_path']) ? $this->settings['piwik_tracker_path'] : '../vendor/piwik/piwik-php-tracker/';
     $this->settings['skin'] = (@$this->settings['skin'] && is_dir('skin/'.$this->settings['skin'])) ? $this->settings['skin'] : 'default';
-    $this->settings['operator_name'] = (@$this->settings['operator_name']) ? $this->settings['operator_name'] : 'AuthServer';
+    $this->settings['operator_name'] = (@$this->settings['operator_name']) ? $this->settings['operator_name'] : 'Example';
     $this->settings['operator_contact_url'] = (@$this->settings['operator_contact_url']) ? $this->settings['operator_contact_url'] : 'https://github.com/KaiRo_at/authserver/';
     $this->settings['info_from_email'] = (@$this->settings['info_from_email']) ? $this->settings['info_from_email'] : 'noreply@example.com';
 

diff --git a/etc/kairo/auth_settings.json b/etc/kairo/auth_settings.json
index 864ca60c98a3c6803e004440a404795044d53930..f1d6c05244606f282be99f9059b2345dfbe596fe 100644 (file)
--- a/etc/kairo/auth_settings.json
+++ b/etc/kairo/auth_settings.json
@@ -9,7 +9,7 @@
 ],
 "client_reg_email_whitelist": ["you@example.com"],
 "skin": "default",
-"operator_name": "AuthServer",
+"operator_name": "Example",
 "operator_contact_url": "https://github.com/KaiRo_at/authserver/",
 "info_from_email": "noreply@example.com",
 "piwik_enabled": false,

diff --git a/locale/de/LC_MESSAGES/kairo_auth.mo b/locale/de/LC_MESSAGES/kairo_auth.mo
index 5b02beabd5e88e3cf36238ad4db2ff00a36c8d25..41ba02d5e21f18c7b1582f206ed94592d9d628a9 100644 (file)
Binary files a/locale/de/LC_MESSAGES/kairo_auth.mo and b/locale/de/LC_MESSAGES/kairo_auth.mo differ

diff --git a/locale/de/LC_MESSAGES/kairo_auth.po b/locale/de/LC_MESSAGES/kairo_auth.po
index c56e7bc344385b3aae0c03e844687a3da732e55d..03a01c074f327c0e236558bd3f2c9f1d2a38baa8 100644 (file)
--- a/locale/de/LC_MESSAGES/kairo_auth.po
+++ b/locale/de/LC_MESSAGES/kairo_auth.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kairo-auth\n"
 "Report-Msgid-Bugs-To: kairo@kairo.at\n"
-"POT-Creation-Date: 2016-11-18 18:05+0100\n"
+"POT-Creation-Date: 2017-01-20 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,12 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Language: de\n"
 
-msgid ""
-"This login system does not work without JavaScript. Please activate "
-"JavaScript for this site to log in."
-msgstr ""
-"Dieses Login-System functioniert nicht ohne JavaScript. Bitte aktivieren Sie "
-"JavaScript für diese Seite, um sich anzumelden."
+#, php-format
+msgid "Authorization Request | %s"
+msgstr "Authorisierungsanfrage | %s"
+
+#, php-format
+msgid "%s Authentication Server"
+msgstr "%s Authentifizierungs-Server"
 
 msgid "Unexpected error while logging out."
 msgstr "Unerwarteter Fehler beim Abmelden."
@@ -33,12 +34,11 @@ msgstr "Unerwarteter Fehler beim Abmelden."
 msgid "The session system is not working."
 msgstr "Das Sitzungssystem funktioniert nicht."
 
-msgid ""
-"Please <a href=\"https://www.kairo.at/contact\">contact KaiRo.at</a> and "
-"tell the team about this."
+#, php-format
+msgid "Please <a href=\"%s\">contact %s</a> and tell the team about this."
 msgstr ""
-"Bitte <a href=\"https://www.kairo.at/contact\">kontaktieren Sie KaiRo.at</a> "
-"und benachrichtigen Sie das Team darüber."
+"Bitte <a href=\"%s\">kontaktieren Sie %s</a> und benachrichtigen Sie das "
+"Team darüber."
 
 #, php-format
 msgid "Hi %s!"
@@ -125,6 +125,13 @@ msgstr "Das Passwort darf nicht nur aus Zahlen bestehen."
 msgid "Password does have to contain at least %s different characters."
 msgstr "Das Passwort muss zumindest %s verschiedene Zeichen enthalten."
 
+msgid ""
+"This login system does not work without JavaScript. Please activate "
+"JavaScript for this site to log in."
+msgstr ""
+"Dieses Login-System functioniert nicht ohne JavaScript. Bitte aktivieren Sie "
+"JavaScript für diese Seite, um sich anzumelden."
+
 msgid "Email"
 msgstr "E-Mail"
 
@@ -150,8 +157,13 @@ msgstr ""
 msgid "Could not add user."
 msgstr "Benutzer konnte nicht hinzugefügt werden."
 
-msgid "KaiRo.at Authentication Service"
-msgstr "KaiRo.at Authentication Service"
+#, php-format
+msgid "%s Authentication Service"
+msgstr "%s Authentifizierungs-Service"
+
+#, fuzzy, php-format
+msgid "Email Verification for %s Authentication"
+msgstr "E-Mail-Verifizierung for %s-Authentifikation"
 
 msgid "Welcome!"
 msgstr "Willkommen!"
@@ -200,6 +212,10 @@ msgstr "Die Bestätigungs-E-Mail konnte nicht an Sie gesendet werden."
 msgid "Could not initiate reset request."
 msgstr "Anfrage zum Zurücksetzen konnte nicht initiiert werden."
 
+#, php-format
+msgid "How to reset your password for %s Authentication"
+msgstr "Aleitung zum Zurücksetzen des Passwortes für %s-Authentifizierung"
+
 msgid "Hi,"
 msgstr "Hallo,"
 

diff --git a/locale/en_US/LC_MESSAGES/kairo_auth.pot b/locale/en_US/LC_MESSAGES/kairo_auth.pot
index 378912d1d0ec9a0aa5e29a4a51dbfb2ffd0e8a3e..49f46afdb180ff703caad76e8ec98c7e309712e6 100644 (file)
--- a/locale/en_US/LC_MESSAGES/kairo_auth.pot
+++ b/locale/en_US/LC_MESSAGES/kairo_auth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kairo-auth \n"
 "Report-Msgid-Bugs-To: kairo@kairo.at\n"
-"POT-Creation-Date: 2016-11-18 18:07+0100\n"
+"POT-Creation-Date: 2017-01-20 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,9 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid ""
-"This login system does not work without JavaScript. Please activate "
-"JavaScript for this site to log in."
+#, php-format
+msgid "Authorization Request | %s"
+msgstr ""
+
+#, php-format
+msgid "%s Authentication Server"
 msgstr ""
 
 msgid "Unexpected error while logging out."
@@ -28,9 +31,8 @@ msgstr ""
 msgid "The session system is not working."
 msgstr ""
 
-msgid ""
-"Please <a href=\"https://www.kairo.at/contact\">contact KaiRo.at</a> and "
-"tell the team about this."
+#, php-format
+msgid "Please <a href=\"%s\">contact %s</a> and tell the team about this."
 msgstr ""
 
 #, php-format
@@ -112,6 +114,11 @@ msgstr ""
 msgid "Password does have to contain at least %s different characters."
 msgstr ""
 
+msgid ""
+"This login system does not work without JavaScript. Please activate "
+"JavaScript for this site to log in."
+msgstr ""
+
 msgid "Email"
 msgstr ""
 
@@ -135,7 +142,12 @@ msgstr ""
 msgid "Could not add user."
 msgstr ""
 
-msgid "KaiRo.at Authentication Service"
+#, php-format
+msgid "%s Authentication Service"
+msgstr ""
+
+#, php-format
+msgid "Email Verification for %s Authentication"
 msgstr ""
 
 msgid "Welcome!"
@@ -175,6 +187,10 @@ msgstr ""
 msgid "Could not initiate reset request."
 msgstr ""
 
+#, php-format
+msgid "How to reset your password for %s Authentication"
+msgstr ""
+
 msgid "Hi,"
 msgstr ""