Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/144968
Change subject: Implemented changes for translatewiki
......................................................................
Implemented changes for translatewiki
Moved to Json i18n files
Change-Id: I460aefd3ed6e31d3357b3ac10f46c5a546211128
---
M UserManager/UserManager.class.php
M UserManager/UserManager.setup.php
A UserManager/i18n/de-formal.json
A UserManager/i18n/de.json
A UserManager/i18n/en.json
A UserManager/i18n/qqq.json
M UserManager/languages/UserManager.i18n.php
M UserManager/resources/BS.UserManager/Panel.js
M UserManager/resources/BS.UserManager/UserDialog.js
9 files changed, 190 insertions(+), 282 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/68/144968/1
diff --git a/UserManager/UserManager.class.php
b/UserManager/UserManager.class.php
index 9fff604..66121e9 100644
--- a/UserManager/UserManager.class.php
+++ b/UserManager/UserManager.class.php
@@ -210,45 +210,45 @@
);
$sUsername = ucfirst( $sUsername );
- if ( Sanitizer::validateEmail( $sUsername ) === false ) {
//TODO: Check if User::isCreatableName() is a better validation
+ if ( User::isCreatableName( $sUsername ) === false ) {
$aResponse['errors'][] = array(
'id' => 'username',
- 'message' => wfMessage(
'bs-usermanager-invalid_uname_gen' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-uname' )->plain()
);
}
- if ( $sEmail != '' && User::isValidEmailAddr ( $sEmail ) ===
false ) {
+ if ( $sEmail != '' && Sanitizer::validateEmail( $sEmail ) ===
false ) {
$aResponse['errors'][] = array(
'id' => 'email',
- 'message' => wfMessage(
'bs-usermanager-invalid_email_gen' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-email-gen' )->plain()
);
}
if ( $sPassword == '' ) {
$aResponse['errors'][] = array(
'id' => 'pass',
- 'message' => wfMessage(
'bs-usermanager-enter_pwd' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-enter-pwd' )->plain()
);
}
if ( strpos( $sRealname, '\\' ) ) {
$aResponse['errors'][] = array(
'id' => 'realname',
- 'message' => wfMessage(
'bs-usermanager-invalid_realname' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-realname' )->plain()
);
}
if ( $sPassword != $sRePassword ) {
$aResponse['errors'][] = array(
'id' => 'repass',
- 'message' => wfMessage(
'bs-usermanager-pwd_nomatch' )->plain()
+ 'message' => wfMessage( 'badretype' )->plain()
// MW message
);
}
if ( strtolower( $sUsername ) == strtolower( $sPassword ) ) {
$aResponse['errors'][] = array(
'id' => 'pass',
- 'message' => wfMessage(
'bs-usermanager-user_pwd_match' )->plain()
+ 'message' => wfMessage( 'password-name-match'
)->plain() // MW message
);
}
@@ -256,7 +256,7 @@
if ( $oNewUser == null ) { //Should not be neccessary as we
check for username validity above
$aResponse['errors'][] = array(
'id' => 'username',
- 'message' => wfMessage(
'bs-usermanager-invalid_uname' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-uname' )->plain()
);
}
@@ -264,7 +264,7 @@
if( $oNewUser->getId() != 0 ) {
$aResponse['errors'][] = array(
'id' => 'username',
- 'message' => wfMessage(
'bs-usermanager-user_exists' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-user-exists' )->plain()
);
}
@@ -272,7 +272,7 @@
//TODO: $oNewUser->getPasswordValidity()
returns a message key in case of error. Maybe we sould return this message.
$aResponse['errors'][] = array(
'id' => 'pass',
- 'message' => wfMessage(
'bs-usermanager-invalid_pwd' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-pwd' )->plain()
);
}
}
@@ -312,14 +312,14 @@
if ( $resDelGroups === false || $resInsGroups === false ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-db_error' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-db-error' )->plain();
}
$ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
$ssUpdate->doUpdate();
$aResponse['success'] = true;
- $aResponse['message'][] = wfMessage(
'bs-usermanager-user_added' )->plain();
+ $aResponse['message'][] = wfMessage(
'bs-usermanager-user-added' )->plain();
$_SESSION['wsDomain'] = $tmpDomain;
@@ -371,34 +371,34 @@
if ( $oUser->getId() === 0 ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-id_noexist' )->plain(); // id_noexist = 'This user ID does not
exist'
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-idnotexist' )->plain(); // id_noexist = 'This user ID does not
exist'
}
- if ( strpos( $sPassword, '\\' ) ) {
+ if ( $oUser->isValidPassword( $sPassword ) ) {
$aAnswer['success'] = false;
$aAnswer['errors'][] = array(
'id' => 'pass',
- 'message' => wfMessage(
'bs-usermanager-invalid_pwd' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-pwd' )->plain()
); // 'invalid_pwd' = 'The supplied password is
invalid. Please do not use apostrophes or backslashes.'
}
if ( $sPassword !== $sRePassword ) {
$aAnswer['success'] = false;
$aAnswer['errors'][] = array(
'id' => 'newpass',
- 'message' => wfMessage(
'bs-usermanager-pwd_nomatch' )->plain()
+ 'message' => wfMessage( 'badretype' )->plain()
// MW message
);
}
if ( strpos( $sRealname, '\\' ) ) {
$aAnswer['success'] = false;
$aAnswer['errors'][] = array(
'id' => 'realname',
- 'message' => wfMessage(
'bs-usermanager-invalid_realname' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-realname' )->plain()
);
}
if ( $sEmail != '' && Sanitizer::validateEmail( $sEmail ) ===
false ) {
$aAnswer['success'] = false;
$aAnswer['errors'][] = array(
'id' => 'email',
- 'message' => wfMessage(
'bs-usermanager-invalid_email_gen' )->plain()
+ 'message' => wfMessage(
'bs-usermanager-invalid-email-gen' )->plain()
);
}
@@ -450,11 +450,11 @@
if ( $res === false || $resDelGroups === false
|| !$resInsGroups || $resERealUser === false ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-db_error' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-db-error' )->plain();
}
if ( $aAnswer['success'] ) {
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-save_successful' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-save-successful' )->plain();
}
return json_encode( $aAnswer );
@@ -487,18 +487,18 @@
if ( $oUser->getId() == 0 ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-id_noexist' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-idnotexist' )->plain();
}
if ( $oUser->getId() == 1 ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-admin_nodelete' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-admin-nodelete' )->plain();
}
global $wgUser;
if ( $oUser->getId() == $wgUser->getId() ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-self_nodelete' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-self-nodelete' )->plain();
}
if( !$aAnswer['success'] ) {
@@ -523,16 +523,16 @@
if ( $oUser->getUserPage()->exists() ) {
$oUserPageArticle = new Article( $oUser->getUserPage()
);
- $oUserPageArticle->doDelete( wfMessage(
'bs-usermanager-db_error' )->plain() );
+ $oUserPageArticle->doDelete( wfMessage(
'bs-usermanager-db-error' )->plain() );
}
if ( ( $res === false ) || ( $res1 === false ) || ( $res2 ===
false ) || ( $res3 === false ) ) {
$aAnswer['success'] = false;
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-db_error' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-db-error' )->plain();
return json_encode( $aAnswer );
}
- $aAnswer['message'][] = wfMessage(
'bs-usermanager-user_deleted' )->plain();
+ $aAnswer['message'][] = wfMessage(
'bs-usermanager-user-deleted' )->plain();
return json_encode( $aAnswer );
}
diff --git a/UserManager/UserManager.setup.php
b/UserManager/UserManager.setup.php
index cc08065..0072923 100644
--- a/UserManager/UserManager.setup.php
+++ b/UserManager/UserManager.setup.php
@@ -2,40 +2,25 @@
BsExtensionManager::registerExtension('UserManager',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
+$wgMessagesDirs['UserManager'] = __DIR__ . '/i18n';
+
$wgExtensionMessagesFiles['UserManager'] = __DIR__ .
'/languages/UserManager.i18n.php';
$wgResourceModules['ext.bluespice.userManager'] = array(
'scripts' => 'bluespice.userManager.js',
'dependencies' => 'ext.bluespice.extjs',
'messages' => array(
- 'bs-usermanager-headerUsername',
- 'bs-usermanager-headerRealname',
- 'bs-usermanager-headerEmail',
- 'bs-usermanager-headerGroups',
- 'bs-usermanager-headerActions',
- 'bs-usermanager-tipEditPass',
- 'bs-usermanager-tipEditDetails',
- 'bs-usermanager-tipEditGroups',
- 'bs-usermanager-tipDeleteUser',
- 'bs-usermanager-btnOk',
- 'bs-usermanager-btnCancel',
- 'bs-usermanager-titleError',
- 'bs-usermanager-unknownError',
- 'bs-usermanager-titleAddUser',
- 'bs-usermanager-titleEditDetails',
- 'bs-usermanager-labelUsername',
- 'bs-usermanager-labelRealname',
- 'bs-usermanager-labelEmail',
- 'bs-usermanager-labelChangetext',
- 'bs-usermanager-titleEditPassword',
- 'bs-usermanager-labelNewPassword',
- 'bs-usermanager-labelPasswordCheck',
- 'bs-usermanager-labelgroups',
- 'bs-usermanager-titleEditGroups',
- 'bs-usermanager-titleDeleteUser',
- 'bs-usermanager-confirmDeleteUser',
- 'bs-usermanager-showEntries',
- 'bs-usermanager-textCannotEditOwn',
+ 'bs-usermanager-headerusername',
+ 'bs-usermanager-headerrealname',
+ 'bs-usermanager-headeremail',
+ 'bs-usermanager-headergroups',
+ 'bs-usermanager-titleadduser',
+ 'bs-usermanager-titleeditdetails',
+ 'bs-usermanager-labelnewpassword',
+ 'bs-usermanager-labelpasswordcheck',
+ 'bs-usermanager-headergroups',
+ 'bs-usermanager-titledeleteuser',
+ 'bs-usermanager-confirmdeleteuser'
),
'localBasePath' => __DIR__ . '/resources',
'remoteExtPath' => 'BlueSpiceExtensions/UserManager/resources'
diff --git a/UserManager/i18n/de-formal.json b/UserManager/i18n/de-formal.json
new file mode 100644
index 0000000..b89f7d4
--- /dev/null
+++ b/UserManager/i18n/de-formal.json
@@ -0,0 +1,13 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usermanager-self-nodelete": "Sie können nicht Ihr Benutzerkonto
löschen.",
+ "bs-usermanager-enter-pwd": "Bitte geben Sie ein Passwort ein.",
+ "bs-usermanager-invalid-pwd": "Das Passwort ist unzulässig.",
+ "bs-usermanager-invalid-realname": "Der echte Name ist unzulässig.",
+ "bs-usermanager-invalid-uname": "Der Benutzername ist unzulässig.",
+ "bs-usermanager-confirmdeleteuser": "Sind Sie sicher, dass Sie
{{PLURAL:$1|diesen|diese $1}} Benutzer löschen wollen?"
+}
diff --git a/UserManager/i18n/de.json b/UserManager/i18n/de.json
new file mode 100644
index 0000000..ae3ecc9
--- /dev/null
+++ b/UserManager/i18n/de.json
@@ -0,0 +1,32 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usermanager-desc": "Administrationsoberfläche für das Verwalten von
Benutzern",
+ "bs-usermanager-admin-nodelete": "Der Administrator-Account kann nicht
gelöscht werden.",
+ "bs-usermanager-self-nodelete": "Du kannst nicht dein Benutzerkonto
löschen.",
+ "bs-usermanager-db-error": "Es ist ein Datenbankfehler aufgetreten.",
+ "bs-usermanager-enter-pwd": "Bitte gib ein Passwort ein.",
+ "bs-usermanager-idnotexist": "Dieser Benutzer existiert nicht.",
+ "bs-usermanager-invalid-pwd": "Das Passwort ist unzulässig.",
+ "bs-usermanager-invalid-realname": "Der echt Name ist unzulässig.",
+ "bs-usermanager-invalid-uname": "Der Benutzername ist unzulässig.",
+ "bs-usermanager-invalid-email-gen": "Die E-Mail-Adresse ist
unzulässig.",
+ "bs-usermanager-label": "Benutzerverwaltung",
+ "bs-usermanager-user-added": "Der Benutzer wurde hinzugefügt.",
+ "bs-usermanager-user-deleted": "Der Benutzer wurde gelöscht.",
+ "bs-usermanager-user-exists": "Der Benutzername ist schon vorhanden.",
+ "bs-usermanager-save-successful": "Änderungen gespeichert.",
+ "bs-usermanager-headerusername": "Benutzername",
+ "bs-usermanager-headerrealname": "Echter Name",
+ "bs-usermanager-headeremail": "E-Mail",
+ "bs-usermanager-headergroups": "Gruppen",
+ "bs-usermanager-titleadduser": "Benutzer hinzufügen",
+ "bs-usermanager-titleeditdetails": "Benutzer bearbeiten",
+ "bs-usermanager-labelnewpassword": "Passwort",
+ "bs-usermanager-labelpasswordcheck": "Passwort bestätigen",
+ "bs-usermanager-titledeleteuser": "Benutzer löschen",
+ "bs-usermanager-confirmdeleteuser": "Bist du sicher, dass du
{{PLURAL:$1|diesen|diese $1}} Benutzer löschen willst?"
+}
diff --git a/UserManager/i18n/en.json b/UserManager/i18n/en.json
new file mode 100644
index 0000000..9e3bd4f
--- /dev/null
+++ b/UserManager/i18n/en.json
@@ -0,0 +1,32 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usermanager-desc": "Administration interface for managing users",
+ "bs-usermanager-admin-nodelete": "The administrator account cannot be
deleted.",
+ "bs-usermanager-self-nodelete": "You cannot delete your account.",
+ "bs-usermanager-db-error": "A database error has occurred.",
+ "bs-usermanager-enter-pwd": "Please enter a password.",
+ "bs-usermanager-idnotexist": "This user does not exist.",
+ "bs-usermanager-invalid-pwd": "The password is invalid.",
+ "bs-usermanager-invalid-realname": "The real name is invalid.",
+ "bs-usermanager-invalid-uname": "The username is invalid.",
+ "bs-usermanager-invalid-email-gen": "The email adresse is invalid.",
+ "bs-usermanager-label": "User manager",
+ "bs-usermanager-user-added": "The user has been added.",
+ "bs-usermanager-user-deleted": "The user has been deleted.",
+ "bs-usermanager-user-exists": "The username already exists.",
+ "bs-usermanager-save-successful": "Changes saved.",
+ "bs-usermanager-headerusername": "Username",
+ "bs-usermanager-headerrealname": "Real name",
+ "bs-usermanager-headeremail": "Email",
+ "bs-usermanager-headergroups": "Groups",
+ "bs-usermanager-titleadduser": "Add user",
+ "bs-usermanager-titleeditdetails": "Edit user",
+ "bs-usermanager-labelnewpassword": "Password",
+ "bs-usermanager-labelpasswordcheck": "Confirm password",
+ "bs-usermanager-titledeleteuser": "Delete user",
+ "bs-usermanager-confirmdeleteuser": "Are you sure, you want to delete
{{PLURAL:$1|this user|these $1 users}}?"
+}
diff --git a/UserManager/i18n/qqq.json b/UserManager/i18n/qqq.json
new file mode 100644
index 0000000..588516e
--- /dev/null
+++ b/UserManager/i18n/qqq.json
@@ -0,0 +1,32 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-usermanager-desc": "Used in
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of user manager
extension",
+ "bs-usermanager-admin-nodelete": "Text for the administrator account
cannot be deleted.",
+ "bs-usermanager-self-nodelete": "Text for you cannot delete your
account.",
+ "bs-usermanager-db-error": "Text for a database error has occurred.",
+ "bs-usermanager-enter-pwd": "Text for please enter a password.",
+ "bs-usermanager-idnotexist": "Text for this user does not exist.",
+ "bs-usermanager-invalid-pwd": "Text for the password is invalid.",
+ "bs-usermanager-invalid-realname": "Text for the real name is invalid.",
+ "bs-usermanager-invalid-uname": "Text for the username is invalid.",
+ "bs-usermanager-invalid-email-gen": "Text for the email adresse is
invalid.",
+ "bs-usermanager-label": "Anchor text for user
manager\\n{{Identical|User manager}}",
+ "bs-usermanager-user-added": "Text for the user has been added.",
+ "bs-usermanager-user-deleted": "Text for the user has been deleted.",
+ "bs-usermanager-user-exists": "Text for the username already exists.",
+ "bs-usermanager-save-successful": "Text for changes saved.",
+ "bs-usermanager-headerusername": "Column headline and label for
username\\n{{Identical|Username}}",
+ "bs-usermanager-headerrealname": "Column headline and label for real
name\\n{{Identical|Real name}}",
+ "bs-usermanager-headeremail": "Column headline and label for
Email\\n{{Identical|Email}}",
+ "bs-usermanager-headergroups": "Column headline and label for
Groups\\n{{Identical|Groups}}",
+ "bs-usermanager-titleadduser": "Window title for add
user\\n{{Identical|Add user}}",
+ "bs-usermanager-titleeditdetails": "Window title for edit
user\\n{{Identical|Edit user}}",
+ "bs-usermanager-labelnewpassword": "Label for
password\\n{{Identical|Password}}",
+ "bs-usermanager-labelpasswordcheck": "Label for confirm
password\\n{{Identical|Confirm password}}",
+ "bs-usermanager-titledeleteuser": "Window title for delete
user\\n{{Identical|Delete user}}",
+ "bs-usermanager-confirmdeleteuser": "Text for are you sure, you want to
delete {{PLURAL:$1|this user|these $1 users}}?\\n $1 is the number of users
which will be deleted - use for PLURAL distinction."
+}
diff --git a/UserManager/languages/UserManager.i18n.php
b/UserManager/languages/UserManager.i18n.php
index 274c94f..9ba0a13 100644
--- a/UserManager/languages/UserManager.i18n.php
+++ b/UserManager/languages/UserManager.i18n.php
@@ -1,221 +1,35 @@
<?php
/**
- * Internationalisation file for UserManager
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * Part of BlueSpice for MediaWiki
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
*
- * @author Stephan Muggli <[email protected]>
-
- * @package BlueSpice_Extensions
- * @subpackage UserManager
- * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9ca2dfd559cf48db' ) ) {
+ function wfJsonI18nShim9ca2dfd559cf48db( $cache, $code, &$cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
"/../i18n/$csCode.json";
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-$messages['en'] = array(
- 'bs-usermanager-extension-description' => 'Administration interface
for adding, editing and deleting users.',
- 'bs-usermanager-actions' => 'Actions',
- 'bs-usermanager-admin_nodelete' => 'The administrator account
can\'t be deleted',
- 'bs-usermanager-self_nodelete' => 'Your own user account can
not be deleted',
- 'bs-usermanager-authorizations' => 'Authorizations',
- 'bs-usermanager-button_cancel' => 'Cancel',
- 'bs-usermanager-button_ok' => 'OK',
- 'bs-usermanager-change_password' => '$1 - Change password',
- 'bs-usermanager-changetext' => 'Rename in articles',
- 'bs-usermanager-confirm_delete' => '<b>$1</b><br/>Do you
really want to delete this user?',
- 'bs-usermanager-create_new_user' => 'Create new user',
- 'bs-usermanager-db_error' => 'A database error has
occurred',
- 'bs-usermanager-delete' => '$1 - Delete',
- 'bs-usermanager-edit' => '$1 - Edit details',
- 'bs-usermanager-email' => 'Email',
- 'bs-usermanager-enter_pwd' => 'Enter a password',
- 'bs-usermanager-enter_pwd' => 'Please enter a password',
- 'bs-usermanager-enter_user' => 'Enter a username',
- 'bs-usermanager-group_added' => 'The groups have been
added',
- 'bs-usermanager-id_noexist' => 'This user ID does not
exist',
- 'bs-usermanager-invalid_email' => 'The supplied E-mail is
invalid. Please do not use apostrophes or backslashes.',
- 'bs-usermanager-invalid_pwd' => 'The supplied password is
invalid. Please do not use apostrophes or backslashes.',
- 'bs-usermanager-invalid_realname' => 'The supplied real name is
invalid. Please do not use apostrophes or backslashes.',
- 'bs-usermanager-invalid_uname' => 'The supplied username is
invalid. Please do not use apostrophes or backslashes.',
- 'bs-usermanager-invalid_email_gen' => 'The supplied E-mail is
invalid.',
- 'bs-usermanager-invalid_uname_gen' => 'The supplied username is
invalid.',
- 'bs-usermanager-label' => 'User manager',
- 'bs-usermanager-name' => 'Name',
- 'bs-usermanager-new_password' => 'Enter new password',
- 'bs-usermanager-new_password_confirm' => 'Confirm new password',
- 'bs-usermanager-new_uname' => 'Enter new username',
- 'bs-usermanager-new_user' => 'New user',
- 'bs-usermanager-no-users-left' => 'You have reached the
maximum number of $1 users',
- 'bs-usermanager-not_allowed' => 'You are not allowed to
use this page.',
- 'bs-usermanager-password' => 'Password',
- 'bs-usermanager-password' => 'Password',
- 'bs-usermanager-pwd_changed' => 'The password has been
changed',
- 'bs-usermanager-pwd_confirm' => 'Confirm password',
- 'bs-usermanager-pwd_nomatch' => 'The supplied passwords do
not match',
- 'bs-usermanager-realname' => 'Real name',
- 'bs-usermanager-select_group' => 'Please select one or more
groups:',
- 'bs-usermanager-sysop_rights' => 'You cannot remove the
administrator\'s Sysop rights',
- 'bs-usermanager-secure' => 'Secure',
- 'bs-usermanager-to_group' => '$1 - Change groups',
- 'bs-usermanager-user_added' => 'User has been added',
- 'bs-usermanager-user_deleted' => 'User has been deleted',
- 'bs-usermanager-user_edited' => 'The changes have been
saved.',
- 'bs-usermanager-user_exists' => 'Username already exists',
- 'bs-usermanager-user_pwd_match' => 'Username and password
cannot be the same',
- 'bs-usermanager-username' => 'Username',
- 'bs-usermanager-users-left' => 'You can create <b>$1</b>
more users',
- 'bs-usermanager-users_left' => 'You have $1 users left',
- 'bs-usermanager-users_max' => 'You have reached the
maximum of $1 users',
- 'bs-usermanager-save_successful' => 'Changes have saved
successfully',
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
- 'UserManager' => 'User manager',
- 'prefs-UserManager' => 'User manager',
-
- //JavaScript
- 'bs-usermanager-headerUsername' => 'User name',
- 'bs-usermanager-headerRealname' => 'Real name',
- 'bs-usermanager-labelgroups' => 'Groups',
- 'bs-usermanager-headerEmail' => 'Email',
- 'bs-usermanager-headerGroups' => 'Groups',
- 'bs-usermanager-headerActions' => 'Actions',
- 'bs-usermanager-tipEditPass' => 'Change password',
- 'bs-usermanager-tipEditDetails' => 'Edit details',
- 'bs-usermanager-tipEditGroups' => 'Edit groups',
- 'bs-usermanager-tipDeleteUser' => 'Delete user',
- 'bs-usermanager-btnOk' => 'Ok',
- 'bs-usermanager-btnCancel' => 'Cancel',
- 'bs-usermanager-titleError' => 'Error',
- 'bs-usermanager-unknownError' => 'An unknown error occurred.',
- 'bs-usermanager-titleAddUser' => 'Add user',
- 'bs-usermanager-titleEditDetails' => 'Edit user',
- 'bs-usermanager-labelUsername' => 'User name',
- 'bs-usermanager-labelRealname' => 'Real name',
- 'bs-usermanager-labelEmail' => 'Email',
- 'bs-usermanager-labelChangetext' => 'Rename in articles',
- 'bs-usermanager-titleEditPassword' => 'Change password',
- 'bs-usermanager-labelNewPassword' => 'New password',
- 'bs-usermanager-labelPasswordCheck' => 'Retype password',
- 'bs-usermanager-titleEditGroups' => 'Edit groups',
- 'bs-usermanager-titleDeleteUser' => 'Delete user',
- 'bs-usermanager-confirmDeleteUser' => 'Are you sure, you want to delete
{{PLURAL:$1|this user|these $1 users}}?',
- 'bs-usermanager-showEntries' => 'Displaying {0} - {1} of {2}',
- 'bs-usermanager-textCannotEditOwn' => 'You cannot change or delete your
own account.',
-);
-
-$messages['de'] = array(
- 'bs-usermanager-extension-description' => 'Administrationsoberfläche
für das Anlegen, Bearbeiten und Löschen von Wikiusern.',
- 'bs-usermanager-actions' => 'Aktionen',
- 'bs-usermanager-admin_nodelete' => 'Der Administrator-Account
ist nicht löschbar',
- 'bs-usermanager-self_nodelete' => 'Das eigene Benutzerkonto
kann nicht gelöscht werden',
- 'bs-usermanager-authorizations' => 'Berechtigungen',
- 'bs-usermanager-button_cancel' => 'Abbrechen',
- 'bs-usermanager-button_ok' => 'OK',
- 'bs-usermanager-change_password' => '$1 - Passwort ändern',
- 'bs-usermanager-changetext' => 'In
Artikeln<br>umbenennen',
- 'bs-usermanager-confirm_delete' => 'Willst Du den Benutzer
<br/><b>$1</b><br/> wirklich löschen?',
- 'bs-usermanager-create_new_user' => 'Neuen Benutzer anlegen',
- 'bs-usermanager-db_error' => 'Es ist ein Fehler in der
Datenbank aufgetreten',
- 'bs-usermanager-delete' => '$1 - Löschen',
- 'bs-usermanager-edit' => '$1 - Details bearbeiten',
- 'bs-usermanager-email' => 'E-Mail',
- 'bs-usermanager-enter_pwd' => 'Bitte gib ein Passwort
ein',
- 'bs-usermanager-enter_pwd' => 'Bitte gib ein Passwort
ein',
- 'bs-usermanager-enter_user' => 'Bitte gib einen
Benutzernamen ein',
- 'bs-usermanager-group_added' => 'Die Gruppen wurden
übernommen',
- 'bs-usermanager-groups-for' => 'Gruppen für <b>$1</b>',
- 'bs-usermanager-id_noexist' => 'Die Benutzer-ID gibt es
nicht',
- 'bs-usermanager-invalid_email' => 'Die E-Mail-Adresse ist
ungültig. Verwende keine Hochkommas oder Backslashes.',
- 'bs-usermanager-invalid_pwd' => 'Das Passwort ist
ungültig. Verwende keine Hochkommas oder Backslashes',
- 'bs-usermanager-invalid_realname' => 'Der echte Name ist
ungültig. Verwende keine Hochkommas oder Backslashes.',
- 'bs-usermanager-invalid_uname' => 'Der Benutzername ist
ungültig. Verwende keine Hochkommas oder Backslashes.',
- 'bs-usermanager-invalid_email_gen' => 'Die E-Mail-Adresse ist
ungültig.',
- 'bs-usermanager-invalid_uname_gen' => 'Der Benutzername ist
ungültig.',
- 'bs-usermanager-label' => 'Benutzerverwaltung',
- 'bs-usermanager-name' => 'Name',
- 'bs-usermanager-new_password' => 'Neues Passwort eingeben',
- 'bs-usermanager-new_password_confirm' => 'Neues Passwort
bestätigen',
- 'bs-usermanager-new_uname' => 'Neuer Name',
- 'bs-usermanager-new_user' => 'Neuer Benutzer',
- 'bs-usermanager-no-users-left' => 'Du hast die maximale
Anzahl von $1 Benutzern erreicht.',
- 'bs-usermanager-not_allowed' => 'Du bist nicht berechtigt,
diese Aktion auszuführen.',
- 'bs-usermanager-password' => 'Passwort',
- 'bs-usermanager-password' => 'Passwort',
- 'bs-usermanager-pwd_changed' => 'Das Passwort wurde
geändert',
- 'bs-usermanager-pwd_confirm' => 'Passwort bestätigen',
- 'bs-usermanager-pwd_nomatch' => 'Die beiden Passwörter
stimmen nicht überein',
- 'bs-usermanager-realname' => 'Echter Name',
- 'bs-usermanager-select_group' => 'Bitte wähle eine oder
mehrere Gruppen aus:',
- 'bs-usermanager-sysop_rights' => 'Du kannst dem
Administrator die Sysop-Rechte nicht nehmen',
- 'bs-usermanager-secure' => 'Secure',
- 'bs-usermanager-to_group' => '$1 - Gruppen bearbeiten',
- 'bs-usermanager-user_added' => 'Der Benutzer wurde
hinzugefügt',
- 'bs-usermanager-user_deleted' => 'Der Benutzer wurde
gelöscht',
- 'bs-usermanager-user_edited' => 'Die Änderungen wurden
gespeichert',
- 'bs-usermanager-user_exists' => 'Der Benutzername ist
schon vorhanden',
- 'bs-usermanager-user_pwd_match' => 'Benutzername und Passwort
dürfen nicht gleich sein',
- 'bs-usermanager-username' => 'Name des Benutzers',
- 'bs-usermanager-users-left' => 'Du kannst noch <b>$1</b>
Benutzer anlegen',
- 'bs-usermanager-users_left' => 'Du hast noch $1 User
frei',
- 'bs-usermanager-users_max' => 'Du hast bereits die
maximale Anzahl von $1 Benutzern eingerichtet',
- 'bs-usermanager-save_successful' => 'Änderungen erfolgreich
gespeichert',
-
- 'UserManager' => 'Benutzerverwaltung',
- 'prefs-UserManager' => 'Benutzerverwaltung',
-
- //JavaScript
- 'bs-usermanager-headerUsername' => 'Benutzername',
- 'bs-usermanager-headerRealname' => 'Echter Name',
- 'bs-usermanager-labelgroups' => 'Gruppen',
- 'bs-usermanager-headerEmail' => 'E-Mail',
- 'bs-usermanager-headerGroups' => 'Gruppen',
- 'bs-usermanager-headerActions' => 'Aktionen',
- 'bs-usermanager-tipEditPass' => 'Passwort ändern',
- 'bs-usermanager-tipEditDetails' => 'Details bearbeiten',
- 'bs-usermanager-tipEditGroups' => 'Gruppen bearbeiten',
- 'bs-usermanager-tipDeleteUser' => 'Benutzer löschen',
- 'bs-usermanager-btnOk' => 'Ok',
- 'bs-usermanager-btnCancel' => 'Abbrechen',
- 'bs-usermanager-titleError' => 'Fehler',
- 'bs-usermanager-unknownError' => 'Ein unbekannter Fehler ist
aufgetreten.',
- 'bs-usermanager-titleAddUser' => 'Benutzer hinzufügen',
- 'bs-usermanager-titleEditDetails' => 'Benutzer bearbeiten',
- 'bs-usermanager-labelUsername' => 'Benutzername',
- 'bs-usermanager-labelRealname' => 'Echter Name',
- 'bs-usermanager-labelEmail' => 'E-Mail',
- 'bs-usermanager-labelChangetext' => 'in Beiträgen umbenennen',
- 'bs-usermanager-titleEditPassword' => 'Passwort ändern',
- 'bs-usermanager-labelNewPassword' => 'Neues Passwort',
- 'bs-usermanager-labelPasswordCheck' => 'Passwortwiederholung',
- 'bs-usermanager-titleEditGroups' => 'Gruppen bearbeiten',
- 'bs-usermanager-titleDeleteUser' => 'Benutzer löschen',
- 'bs-usermanager-confirmDeleteUser' => 'Bist du sicher, dass du
{{PLURAL:$1|diesen|diese $1}} Benutzer löschen willst?',
- 'bs-usermanager-showEntries' => 'Angezeigte Einträge {0} - {1} von {2}',
- 'bs-usermanager-textCannotEditOwn' => 'Du kannst dein eigenes
Benutzerkonto nicht bearbeiten oder löschen.',
-);
-
-$messages['de-formal'] = array(
- 'bs-usermanager-confirm_delete' => 'Wollen Sie den Benutzer
<br/><b>$1</b><br/> wirklich löschen?',
- 'bs-usermanager-enter_pwd' => 'Bitte geben Sie ein
Passwort ein',
- 'bs-usermanager-enter_pwd' => 'Bitte geben Sie ein
Passwort ein',
- 'bs-usermanager-enter_user' => 'Bitte geben Sie einen
Benutzernamen ein',
- 'bs-usermanager-invalid_email' => 'Die E-Mail-Adresse ist
ungültig. Verwenden Sie keine Hochkommas oder Backslashes.',
- 'bs-usermanager-invalid_pwd' => 'Das Passwort ist
ungültig. Verwenden Sie keine Hochkommas oder Backslashes',
- 'bs-usermanager-invalid_realname' => 'Der echte Name ist
ungültig. Verwenden Sie keine Hochkommas oder Backslashes.',
- 'bs-usermanager-invalid_uname' => 'Der Benutzername ist
ungültig. Verwenden Sie keine Hochkommas oder Backslashes.',
- 'bs-usermanager-no-users-left' => 'Sie haben die maximale
Anzahl von $1 Benutzern erreicht.',
- 'bs-usermanager-not_allowed' => 'Sie sind nicht
berechtigt, diese Aktion auszuführen.',
- 'bs-usermanager-select_group' => 'Bitte wählen Sie eine
oder mehrere Gruppen aus:',
- 'bs-usermanager-sysop_rights' => 'Sie können dem
Administrator die Sysop-Rechte nicht nehmen',
- 'bs-usermanager-users-left' => 'Sie können noch <b>$1</b>
Benutzer anlegen',
- 'bs-usermanager-users_left' => 'Sie haben noch $1 User
frei',
- 'bs-usermanager-users_max' => 'Sie haben bereits die
maximale Anzahl von $1 Benutzern eingerichtet',
-
- //JavaScript
- 'bs-usermanager-confirmDeleteUser' => 'Sind Sie sicher, dass Sie
{{PLURAL:$1|diesen|diese $1}} Benutzer löschen wollen?',
- 'bs-usermanager-textCannotEditOwn' => 'Sie können Ihr eigenes
Benutzerkonto nicht bearbeiten oder löschen.',
-);
-
-$messages['qqq'] = array();
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9ca2dfd559cf48db';
+}
diff --git a/UserManager/resources/BS.UserManager/Panel.js
b/UserManager/resources/BS.UserManager/Panel.js
index a78b7ba..42d7476 100644
--- a/UserManager/resources/BS.UserManager/Panel.js
+++ b/UserManager/resources/BS.UserManager/Panel.js
@@ -63,27 +63,27 @@
this.colUserName = Ext.create( 'Ext.grid.column.Template', {
id: 'username',
- header:
mw.message('bs-usermanager-headerUsername').plain(),
+ header:
mw.message('bs-usermanager-headerusername').plain(),
sortable: true,
dataIndex: 'user_name',
tpl: '<a href="{user_page}">{user_name}</a>'
} );
this.colRealName = Ext.create( 'Ext.grid.column.Template', {
id: 'userrealname',
- header:
mw.message('bs-usermanager-headerRealname').plain(),
+ header:
mw.message('bs-usermanager-headerrealname').plain(),
sortable: true,
dataIndex: 'user_real_name',
tpl: '{user_real_name}'
} );
this.colEmail = Ext.create( 'Ext.grid.column.Column', {
id: this.getId()+'-useremail',
- header:
mw.message('bs-usermanager-headerEmail').plain(),
+ header:
mw.message('bs-usermanager-headeremail').plain(),
sortable: true,
dataIndex: 'user_email',
renderer: this.renderEmail
} );
this.colGroups = Ext.create( 'Ext.grid.column.Column', {
- header:
mw.message('bs-usermanager-headerGroups').plain(),
+ header:
mw.message('bs-usermanager-headergroups').plain(),
dataIndex: 'groups',
renderer: this.renderGroups,
sortable: false
@@ -142,7 +142,7 @@
}
this.active = 'add';
- this.dlgUserAdd.setTitle( mw.message(
'bs-usermanager-titleAddUser' ).plain() );
+ this.dlgUserAdd.setTitle( mw.message(
'bs-usermanager-titleadduser' ).plain() );
this.dlgUserAdd.tfUserName.enable();
this.dlgUserAdd.show();
this.callParent( arguments );
@@ -155,7 +155,7 @@
}
this.active = 'edit';
- this.dlgUserEdit.setTitle( mw.message(
'bs-usermanager-titleEditDetails' ).plain() );
+ this.dlgUserEdit.setTitle( mw.message(
'bs-usermanager-titleeditdetails' ).plain() );
this.dlgUserEdit.tfUserName.disable();
this.dlgUserEdit.setData( selectedRow[0].getData() );
this.dlgUserEdit.show();
@@ -165,8 +165,8 @@
bs.util.confirm(
'UMremove',
{
- text: mw.message(
'bs-usermanager-confirmDeleteUser',
this.grdMain.getSelectionModel().getSelection().length ).text(),
- title: mw.message(
'bs-usermanager-titleDeleteUser' ).plain()
+ text: mw.message(
'bs-usermanager-confirmdeleteuser',
this.grdMain.getSelectionModel().getSelection().length ).text(),
+ title: mw.message(
'bs-usermanager-titledeleteuser' ).plain()
},
{
ok: this.onRemoveUserOk,
diff --git a/UserManager/resources/BS.UserManager/UserDialog.js
b/UserManager/resources/BS.UserManager/UserDialog.js
index 546faee..e6b58b7 100644
--- a/UserManager/resources/BS.UserManager/UserDialog.js
+++ b/UserManager/resources/BS.UserManager/UserDialog.js
@@ -22,7 +22,7 @@
this.cbGroups.setValue(
this.getGroupsValue(this.currentData.groups) );
}
this.tfUserName = Ext.create( 'Ext.form.TextField', {
- fieldLabel:
mw.message('bs-usermanager-labelUsername').plain(),
+ fieldLabel:
mw.message('bs-usermanager-headerusername').plain(),
labelWidth: 130,
labelAlign: 'right',
name: 'username',
@@ -30,7 +30,7 @@
});
this.tfPassword = Ext.create( 'Ext.form.TextField', {
inputType: 'password',
- fieldLabel:
mw.message('bs-usermanager-labelNewPassword').plain(),
+ fieldLabel:
mw.message('bs-usermanager-labelnewpassword').plain(),
labelWidth: 130,
labelAlign: 'right',
name: 'pass',
@@ -38,27 +38,27 @@
});
this.tfRePassword = Ext.create( 'Ext.form.TextField', {
inputType: 'password',
- fieldLabel:
mw.message('bs-usermanager-labelPasswordCheck').plain(),
+ fieldLabel:
mw.message('bs-usermanager-labelpasswordcheck').plain(),
labelWidth: 130,
labelAlign: 'right',
name: 'repass',
allowBlank: false
});
this.tfEmail = Ext.create( 'Ext.form.TextField', {
- fieldLabel:
mw.message('bs-usermanager-labelEmail').plain(),
+ fieldLabel:
mw.message('bs-usermanager-headeremail').plain(),
labelWidth: 130,
labelAlign: 'right',
name: 'email'
});
this.tfRealName = Ext.create( 'Ext.form.TextField', {
- fieldLabel:
mw.message('bs-usermanager-labelRealname').plain(),
+ fieldLabel:
mw.message('bs-usermanager-headerrealname').plain(),
labelWidth: 130,
labelAlign: 'right',
name: 'realname'
});
this.cbGroups = Ext.create( 'Ext.ux.form.MultiSelect', {
- fieldLabel:
mw.message('bs-usermanager-labelgroups').plain(),
+ fieldLabel:
mw.message('bs-usermanager-headergroups').plain(),
labelWidth: 130,
labelAlign: 'right',
store: this.strGroups,
--
To view, visit https://gerrit.wikimedia.org/r/144968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I460aefd3ed6e31d3357b3ac10f46c5a546211128
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
