Raimond Spekking has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/142490

Change subject: Consistency tweaks/i18n review
......................................................................

Consistency tweaks/i18n review

* Make wording consistent with other extensions and core
* Remove Title Case
* Use {{int:..}} syntax
* Delete i18n/de-formal.json because it is widely a dupe of de.json
** Hint: Only translate messages to de-formal where is a difference
(Du->Sie)
* Fix license-name key per LICENSE file

TODO: Please add message documentation per
https://www.mediawiki.org/wiki/I18n#Message_documentation

Once done, I will add the extension to translatewiki.net

Change-Id: I8982cb7e157420e2d4b559cbb0b1a9586674a98c
---
M GoogleLogin.php
D i18n/de-formal.json
M i18n/en.json
3 files changed, 27 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin 
refs/changes/90/142490/1

diff --git a/GoogleLogin.php b/GoogleLogin.php
index 5e296f4..48c5ccb 100644
--- a/GoogleLogin.php
+++ b/GoogleLogin.php
@@ -33,7 +33,7 @@
                'url' => 'https://www.mediawiki.org/wiki/Extension:GoogleLogin',
                'descriptionmsg' => 'googlelogin-desc',
                'version'  => '0.1.0',
-               'license-name' => "Lizenz",
+               'license-name' => "MIT",
        );
 
        // Autoload Classes
diff --git a/i18n/de-formal.json b/i18n/de-formal.json
deleted file mode 100644
index 54329ec..0000000
--- a/i18n/de-formal.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-       "googlelogin": "Anmelden mit Google",
-       "googlelogin-parerror": "Die aufgerufene Unterseite existiert nicht. 
Bitte gehen Sie zurück und versuchen die Aktion erneut.
-       "googlelogin-unexpected-error": "Oops, da war ein unbekanntes Problem. 
Bitte gehen Sie zurück und versuchen die Aktion erneut.",
-       "googlelogin-form-choosename-title": "Wähle Benutzername",
-       "googlelogin-form-choosename": "Wähle deinen Benutzernamen um ein 
Wikibenutzer zu erstellen",
-       "googlelogin-form-choosename-finish-title": "Benutzerkonto erstellen",
-       "googlelogin-form-choosename-finish-body": "Glückwunsch! Du hast 
erfolgreich den Wikibenutzer $1 erstellt und mit deinem Googlekonto verbunden.",
-       "googlelogin-form-choosename-error": "Du musst einen Benutzernamen 
eintragen, oder wähle einen unserer Vorschläge.",
-       "googlelogin-form-choosename-existerror": "Der Benutzername ''$1'' ist 
bereits vergeben. Bitte wähle einen anderen.",
-       "googlelogin-form-chooseown": "Eigener Name",
-       "googlelogin-form-chooseown-error": "Bitte teile uns deinen gewünschten 
Benutzernamen mit, oder wähle einen unserer Vorschläge.",
-       "googlelogin-form-choosename-help": "'Eigener Name' wird nur beachtet, 
wenn 'Eigener Name' ausgewählt wurde.",
-       "googlelogin-form-merge-title": "Benutzerkonten zusammenführen",
-       "googlelogin-form-logout": "Mit einem anderen Googlekonto anmelden",
-       "googlelogin-form-backlink": "Zurück zu Google Login",
-       "googlelogin-form-create": "Benutzerkonto erstellen",
-       "googlelogin-form-merge": "Verknüpfe Google- und Wiki-konto",
-       "googlelogin-form-unlink": "Löse Google- und Wiki-konto-Verknüpfung",
-       "googlelogin-username": "Benutzername",
-       "googlelogin-email": "E-Mail-Adress",
-       "googlelogin-googleuser": "Google-Benutzer",
-       "googlelogin-information-title": "Kontoinformationen",
-       "googlelogin-information-body": "In der folgenden Tabelle findest du 
Informationen zu deinem Google-Konto und ob dieser mit einem Wikibenutzer 
verknüpft ist oder nicht.",
-       "googlelogin-linkstatus": "Status der Verknüpfung",
-       "googlelogin-linked": "verknüpft",
-       "googlelogin-unlinked": "nicht verknüpft",
-       "googlelogin-link-other": "Dein Google-Konto ist bereits mit einem 
anderen Wikibenutzer verknüpft. Je Google-Nutzer ist nur eine Verknüpfung 
erlaubt. Bitte löse zuerst die Verknüpfung zu deinem anderen Konto oder 
kontaktiere einen Administrator, wenn du kein anderes Konto besitzt.",
-       "googlelogin-success-merge": "Glückwunsch! Dein Wikiaccount ist nun mit 
deinem Googlekonto verknüpft.",
-       "googlelogin-success-unlink": "Glückwunsch! Dein Wikiaccount ist nicht 
länger mit deinem Googleaccount verknüpft."
-}
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index d8e9e8b..98f3ffc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,32 +1,37 @@
 {
+    "@metadata": {
+        "authors": [
+            "Florian Schmidt"
+        ]
+    },
        "googlelogin": "Login with Google",
-       "googlelogin-desc": "Provides a [[Special:GoogleLogin|Special page]] to 
allow users to login with thier Google accounts.",
+       "googlelogin-desc": "Provides a [[Special:GoogleLogin|Special page]] to 
allow users to login with their Google accounts",
        "googlelogin-parerror": "The requested page doesn't exist. Please go 
back and try the action again.",
        "googlelogin-unexpected-error": "Oops, there was an unexpected error. 
Please go back and try again.",
-       "googlelogin-form-choosename-title": "Choose Username",
-       "googlelogin-form-choosename": "Please choose your Username to create a 
Wikiaccount",
-       "googlelogin-form-choosename-finish-title": "Create Useraccount",
-       "googlelogin-form-choosename-finish-body": "Congratulations! You have 
created the Wikiaccount $1 and linked it with your Google account.",
+       "googlelogin-form-choosename-title": "Choose username",
+       "googlelogin-form-choosename": "Please choose your username to create a 
wiki account",
+       "googlelogin-form-choosename-finish-title": "Create wiki account",
+       "googlelogin-form-choosename-finish-body": "Congratulations! You have 
created the wiki account $1 and linked it with your Google account.",
        "googlelogin-form-choosename-error": "You must choose an username or 
choose one of our suggestion.",
-       "googlelogin-form-choosename-existerror": "The Username ''$1'' is 
already in use, please choose another.",
+       "googlelogin-form-choosename-existerror": "The username ''$1'' is 
already in use, please choose another.",
        "googlelogin-form-chooseown": "Choose own",
-       "googlelogin-form-chooseown-error": "Please let us know your desired 
Username or take one of our suggestions.",
-       "googlelogin-form-choosename-help": "'Own name' is only observed, if 
you choose 'Choose own'.",
-       "googlelogin-form-merge-title": "Merge Useraccount",
-       "googlelogin-form-logout": "Login with another Google Account",
-       "googlelogin-form-backlink": "Back to Google Login",
+       "googlelogin-form-chooseown-error": "Please let us know your desired 
username or take one of our suggestions.",
+       "googlelogin-form-choosename-help": "'Own name' is only observed, if 
you choose '{{int:googlelogin-form-chooseown}}'.",
+       "googlelogin-form-merge-title": "Merge useraccount",
+       "googlelogin-form-logout": "Login with another Google account",
+       "googlelogin-form-backlink": "Back to Google login",
        "googlelogin-form-create": "Create account",
-       "googlelogin-form-merge": "Merge Google to Wiki account",
-       "googlelogin-form-unlink": "Unlink Google->Wiki account",
+       "googlelogin-form-merge": "Merge Google to wiki account",
+       "googlelogin-form-unlink": "Unlink Google -> wiki account",
        "googlelogin-username": "Username",
-       "googlelogin-email": "E-mail adress",
-       "googlelogin-googleuser": "Google-User",
-       "googlelogin-information-title": "Accountinformation",
-       "googlelogin-information-body": "In the following table you find 
information about your Google account and if it is linked to an Wikiaccount or 
not.",
-       "googlelogin-linkstatus": "Link-Status",
+       "googlelogin-email": "Email adress",
+       "googlelogin-googleuser": "Google user",
+       "googlelogin-information-title": "Account information",
+       "googlelogin-information-body": "In the following table you find 
information about your Google account and if it is linked to a wiki account or 
not.",
+       "googlelogin-linkstatus": "Link status",
        "googlelogin-linked": "linked",
        "googlelogin-unlinked": "not linked",
-       "googlelogin-link-other": "Your Google Account is already linked to 
another user. Your Google Account can linked only to one Wikiaccount. Please 
unlink the connection to your other Wikiaccount or contact an administrator, if 
you haven't another Wikiaccount.",
-       "googlelogin-success-merge": "Congratulations! Your Wikiaccount is now 
linked to your Google Account.",
-       "googlelogin-success-unlink": "Congratulations! Your Wikiaccount isn't 
linked to your Google Account anymore."
+       "googlelogin-link-other": "Your Google account is already linked to 
another user. Your Google account can linked only to one wiki account. Please 
unlink the connection to your other wiki account or contact an administrator, 
if you haven't another wiki account.",
+       "googlelogin-success-merge": "Congratulations! Your wiki account is now 
linked to your Google account.",
+       "googlelogin-success-unlink": "Congratulations! Your wiki account isn't 
linked to your Google account anymore."
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/142490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8982cb7e157420e2d4b559cbb0b1a9586674a98c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking <raimond.spekk...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to