From f526331ae87076b8abe25d9d3f79633219017512 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 20 Jan 2017 15:56:35 +0100 Subject: [PATCH] update L10n for the skin/branding changes, make default operator name be 'Example', add a stance of skin documentation to the README --- README.md | 2 ++ app/authutils.php-class | 2 +- etc/kairo/auth_settings.json | 2 +- locale/de/LC_MESSAGES/kairo_auth.mo | Bin 10918 -> 11128 bytes locale/de/LC_MESSAGES/kairo_auth.po | 44 ++++++++++++++++-------- locale/en_US/LC_MESSAGES/kairo_auth.pot | 32 ++++++++++++----- 6 files changed, 58 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index fcc4640..37346a2 100644 --- 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 d901669..65c7afd 100755 --- 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 864ca60..f1d6c05 100644 --- 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 GIT binary patch delta 2130 zcmZA2Z%kEX9KiA4y((TnNDKu*@IYKDSmoN~b}n9(d*hySqX@f& zYnDsh(rV50MgLsORqk#rS8p1YFIpSr)|<8*{TnY_i<+jssJ_2*F0S>A-}yY}+;gAv z{GRiBF7NhU?@Rr#XznXQ>mimAXT2grxM3a#+V5E+#W;gYF=xKWBUpuc{u~bDN!0J< z`9!|Nr?CXvvPI_NZp_62WGIOteKA+-e?xsGcA?0F_$2Pe$wJm&mueO3 zyb}8`faACVKf+!3JwA*<(mw4Gc?q>PR#KUoX(vW8f||f2zJ-6{0ep>0y@HEb&QkPp z(3LDNW&L$2tGPg3$;ONwsIQ_Mbs~>qBOXSb-~{RbGpL#0KrOy9W<|16g}fzcL>;#S z_497*$9~+5=TdYI)47T|(`QNNDE^H_c%P2Aes*iM_aP zxx1pr@FM4*qE7Un;d%!3zSLKAM(I?r=d>!{K%Mb>*otZ7HOp1hqV%!8%uVuaP)Iw8b8K-(tIDkz%4k;ht>EA-iw!U z1NynB+jamCpp6#(f%`E+Vew44gqp}T)QL5+Cr@KLdUgN*L`S#Huc!mNZe`LIBNCk zvgHueq&z^}M`)`jbjkHcDVxyNL+G+<+u|ZkxRz)jc&kp`fb%0(rX8BD>}EHAksX|@ zBi0c5uG$ELplGF==pgi;O$$*+Xq!WLou0cjGhJu9R&b)bL}2iDYch3hXo!PdHP(HU9rTjE2p0 zy6BX*G?Rgq`DQ2wr`^~7$pvGu&$T)tgykwba8Ig(4boPPS+20yH i{bT9tp7hDGE^m=0uul`%XEV4NGj>Kz&1AW8DCb|XF%$^^ delta 1936 zcmaLYZ%kEn9LMqRxq@7|P)K@1B)E!ZM%>FyK_J2)QB)F^Nu;?#0=*ERcpbxXcY~UZ z2mVRhTK=25`Jm>UJE^(3^{iHpT2EZAbj;a&;A+X-sIBPzIro(7Nx$*s^*iU>dw##) z_xJt5RQtJ2shjy39~rHcC?bvq%=$1VlV7wiW}3Z@S8*POv&?p31@_|^{0j4eW*K-L zL--@|6}yYG@K<~Uf5*o#$jt?2DJ!C*f$LFU*phx=+fZ|O5A$#w^@3xl&wYwB@FF(i zC43jBa69hFHtWToumqc#)ok2>%-Qy0A>-R9ow?jNfh^u!WRi9nSK^o0jMEs#<{YyR z@C{sockwCA%QbrwYp@GHK_1y(s0oLdeGK!FTh@q~jBjmp3b7rv(p{(-j-mz}N5;0( zSb^uUA8+Cl*z%~^D(uAwUciO;9UjC<+>c|tydFcOLC@D=N-ONAQ;Fx1ciL^-j`y(x zH|LveLl;Xi%myyQT2!V6@O>OcZONbbDmrt_w&H83OkKe;yoKc$noItlrc*=yU%|I< z3tq*O4%@==6I_4(czVXg1!iZtZoqwb2k&7Qm8p!ikw#^#11SR=^c_K^d<-?-VXVe$ zh2&o|dB6?5pmctEg=MHcYeg1g?WoN3qFy}WKOe&muE%j4Z=)tQKt&(Gdsu?+uurVP zj-fK<;v&43qQfF=0(E@;@INq(+N)r(*(O|rO5F+k8oxnp#bMqqFX0~i0rz5SBwc*p zq9%MD8*l>IMJwg(>2#&4=rESmAz8Q0s2T1=rE&ySe24IPJdPjY4dloAsU+3LLDWR< z<6;bRaT)9IGn~ZLc#35|i9chL&VMeSuH(i=q~7ch?!z;<8zX%BZ9Iy++ngool`KL{ ztOrlx5C(8IXHlnP4(dIlxD0J+dI8H(r)UVHI{#P1U2XVZ&;3M5h6ycAUNt?Q!UjHlz~-wcf2FnWH0#_&6q=|22@y$#7csb z=~b}yR*f?Fx9KdeCfw4jl7PE))&j@9klp44*LNmf9*lM-kK|+(xYMBtC%Pk<+_}3p z78@QOj`npXhV(SnH8_y$>`E@I_dAh)zUTguI~B~WDv!s@>U|%xPJ=8rA*_h~lIN)!Q{n>v5MGD-P diff --git a/locale/de/LC_MESSAGES/kairo_auth.po b/locale/de/LC_MESSAGES/kairo_auth.po index c56e7bc..03a01c0 100644 --- 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 \n" "Language-Team: LANGUAGE \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 contact KaiRo.at and " -"tell the team about this." +#, php-format +msgid "Please contact %s and tell the team about this." msgstr "" -"Bitte kontaktieren Sie KaiRo.at " -"und benachrichtigen Sie das Team darüber." +"Bitte kontaktieren Sie %s 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 378912d..49f46af 100644 --- 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 \n" "Language-Team: LANGUAGE \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 contact KaiRo.at and " -"tell the team about this." +#, php-format +msgid "Please contact %s 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 "" -- 2.43.0