Smuggli has submitted this change and it was merged. Change subject: Implemented changes for translatewiki ......................................................................
Implemented changes for translatewiki First step https://gerrit.wikimedia.org/r/#/c/146803/ Added PLURAL support to a message in all languages Using suggest numParams Change-Id: If7787eaa8ab4615e2ea1a47a89fcc6a9d8fe158a --- M GroupManager/GroupManager.class.php M GroupManager/i18n/de.json M GroupManager/i18n/en.json M GroupManager/i18n/qqq.json 4 files changed, 29 insertions(+), 11 deletions(-) Approvals: Smuggli: Verified; Looks good to me, approved Siebrand: Looks good to me, but someone else must approve diff --git a/GroupManager/GroupManager.class.php b/GroupManager/GroupManager.class.php index 46ba9f7..82a4cd7 100644 --- a/GroupManager/GroupManager.class.php +++ b/GroupManager/GroupManager.class.php @@ -298,7 +298,10 @@ if ( !empty( $aInvalidChars ) ) { return array( 'success' => false, - 'message' => wfMessage( 'bs-groupmanager-invalid-name', implode( ',', $aInvalidChars ) )->plain() + 'message' => wfMessage( 'bs-groupmanager-invalid-name' ) + ->numParams( count( $aInvalidChars ) ) + ->params( implode( ',', $aInvalidChars ) ) + ->text() ); } elseif ( preg_match( "/^[0-9]+$/", $sGroup ) ) { return array( diff --git a/GroupManager/i18n/de.json b/GroupManager/i18n/de.json index 6d370e3..09d32f5 100644 --- a/GroupManager/i18n/de.json +++ b/GroupManager/i18n/de.json @@ -6,14 +6,13 @@ }, "bs-groupmanager-desc": "Administrationsoberfläche zur Konfiguration von Gruppen", "bs-groupmanager-grpexists": "Die Gruppe ist bereits vorhanden.", - "bs-groupmanager-grp_not_exists": "Die Gruppe existiert nicht.", "bs-groupmanager-grpadded": "Die Gruppe wurde hinzugefügt.", "bs-groupmanager-grpedited": "Die Gruppe wurde bearbeitet.", "bs-groupmanager-grpremoved": "Die Gruppe wurde gelöscht.", "bs-groupmanager-label": "Gruppenverwaltung", - "bs-groupmanager-invalid-name": "Der Gruppenname enthält nicht erlaubte Zeichen: $1", + "bs-groupmanager-invalid-name": "Der Gruppenname enthält {{PLURAL:$1|ein|}} nicht erlaubte{{PLURAL:$1|s|}} Zeichen: $2", "bs-groupmanager-invalid-name-length": "Der Gruppenname darf nicht länger als 16 Zeichen lang sein.", - "bs-groupmanager-invalid-name-numeric": "Der Gruppenname darf nicht zur aus Zahlen bestehen.", + "bs-groupmanager-invalid-name-numeric": "Der Gruppenname muss minderstens einen Buchstaben beinhalten.", "bs-groupmanager-headergroup": "Gruppen", "bs-groupmanager-tipremove": "{{PLURAL:$1|Gruppe|Gruppen}} löschen", "bs-groupmanager-titlenewgroup": "Gruppe hinzufügen", diff --git a/GroupManager/i18n/en.json b/GroupManager/i18n/en.json index 4d79b09..c3554ba 100644 --- a/GroupManager/i18n/en.json +++ b/GroupManager/i18n/en.json @@ -6,15 +6,14 @@ }, "bs-groupmanager-desc": "Administration interface for managing groups", "bs-groupmanager-grpexists": "The group already exists.", - "bs-groupmanager-grp_not_exists": "The group does not exist.", "bs-groupmanager-grpadded": "The group has been added.", "bs-groupmanager-grpedited": "The group has been edited.", "bs-groupmanager-grpremoved": "The group has been removed.", "bs-groupmanager-label": "Group manager", - "bs-groupmanager-invalid-name": "The group name contains chars that are not allowed: $1", + "bs-groupmanager-invalid-name": "The group name contains {{PLURAL:$1|an|}} invalid {{PLURAL:$1|character|characters}}: $2", "bs-groupmanager-invalid-name-length": "The group name cannot be longer than 16 characters.", - "bs-groupmanager-invalid-name-numeric": "The group name cannot contain only numbers.", - "bs-groupmanager-headergroup": "Groups", + "bs-groupmanager-invalid-name-numeric": "The group name needs to have at least one character.", + "bs-groupmanager-headergroup": "Group", "bs-groupmanager-tipremove": "Remove {{PLURAL:$1|group|groups}}", "bs-groupmanager-titlenewgroup": "New group", "bs-groupmanager-titleeditgroup": "Edit group", diff --git a/GroupManager/i18n/qqq.json b/GroupManager/i18n/qqq.json index 38eaa1b..01acc39 100644 --- a/GroupManager/i18n/qqq.json +++ b/GroupManager/i18n/qqq.json @@ -4,7 +4,24 @@ "Stephan Muggli <[email protected]>" ] }, - "bs-groupmanager-removegroup-message-success": "Success message after deleting a group or a pair of groups.", - "bs-groupmanager-removegroup-message-failure": "Failure message after deleting a group or a pair of groups.", - "bs-groupmanager-removegroup-message-unknown": "An unexpected error occurred while trying to delete a group." + "bs-groupmanager-desc": "Used in [{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} Special:WikiAdmin?mode=ExtensionInfo], description of group manager extension", + "bs-groupmanager-grpexists": "Error message that the group you want to create already exists.", + "bs-groupmanager-grpadded": "Success message that the group has been added.", + "bs-groupmanager-grpedited": "Success message that the group has been edited.", + "bs-groupmanager-grpremoved": "Success message that the group has been removed.", + "bs-groupmanager-label": "Used in sidebar, anchor text for group manager\n{{Identical|Group manager}}", + "bs-groupmanager-invalid-name": "Error message that the group name contains an invalid character or invalid characters\n*$1 is the number of invalid characetares\n*$2 are the invalid characters", + "bs-groupmanager-invalid-name-length": "Error message that the group name cannot be longer than 16 characters.", + "bs-groupmanager-invalid-name-numeric": "Error message that the group name needs to have at least one character.", + "bs-groupmanager-headergroup": "Column headline for group\n{{Identical|Group}}", + "bs-groupmanager-tipremove": "Window title for remove group or groups\n*$1 is the number of groups which should be removed - use for PLURAL distinction", + "bs-groupmanager-titlenewgroup": "Window title for new group\n{{Identical|New group}}", + "bs-groupmanager-titleeditgroup": "Window title for edit group\n{{Identical|Edit group}}", + "bs-groupmanager-removegroup": "Text message if the user really wants di delete the selected group or groups\n*$1 is the number of groups which should be removed - use for PLURAL distinction", + "bs-groupmanager-removegroup-message-success": "Success message after deleting a group or a pair of groups.\n*$1 is the number of groups which should be removed - use for PLURAL distinction", + "bs-groupmanager-removegroup-message-failure": "Failure message after deleting a group or a pair of groups.\n*$1 is the number of groups which should be removed - use for PLURAL distinction", + "bs-groupmanager-removegroup-message-unknown": "An unexpected error occurred while trying to delete a group.", + "bs-groupmanager-lablename": "Label for a input field thats contains the group name\n{{Identical|Group name:}}", + "bs-groupmanager-msgnoteditable": "Error message that the group you want to edit is a system group and therefore cannot be renamed", + "bs-groupmanager-msgnotremovable": "Error message that the group you want to remove is a system group and therefore cannot be removed" } -- To view, visit https://gerrit.wikimedia.org/r/147055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7787eaa8ab4615e2ea1a47a89fcc6a9d8fe158a Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli <[email protected]> Gerrit-Reviewer: Mglaser <[email protected]> Gerrit-Reviewer: Pigpen <[email protected]> Gerrit-Reviewer: Robert Vogel <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: Smuggli <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
