Raimond Spekking has submitted this change and it was merged.
Change subject: Implemented changes for translatewiki
......................................................................
Implemented changes for translatewiki
* Fixed path to i18n folder
* Removed trailing dot
Change-Id: I7cec46852a4779b246d49796feb4d21b8f62008b
---
A Avatars/i18n/de-formal.json
A Avatars/i18n/de.json
A Avatars/i18n/en.json
A Avatars/i18n/qqq.json
M Avatars/languages/Avatars.i18n.php
5 files changed, 114 insertions(+), 58 deletions(-)
Approvals:
Raimond Spekking: Verified; Looks good to me, approved
diff --git a/Avatars/i18n/de-formal.json b/Avatars/i18n/de-formal.json
new file mode 100644
index 0000000..8639e77
--- /dev/null
+++ b/Avatars/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Marc Reymann <[email protected]>",
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "bs-avatars-warning-text": "Sie haben bereits ein Bild in Ihren
Einstellungen hinterlegt. Wenn Sie Avatare benutzen, wird diese Einstellung
zurückgesetzt. Möchten Sie fortfahren?"
+}
diff --git a/Avatars/i18n/de.json b/Avatars/i18n/de.json
new file mode 100644
index 0000000..d7483e2
--- /dev/null
+++ b/Avatars/i18n/de.json
@@ -0,0 +1,25 @@
+ {
+ "@metadata": {
+ "authors": [
+ "Marc Reymann <[email protected]>",
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "prefs-avatars": "Benutzerbilder",
+ "bs-avatars-desc": "Stellt individuelle und generische Benutzerbilder
bereit",
+ "bs-avatars-pref-generator": "Generator:",
+ "bs-avatars-pref-defaultsize": "Standardgröße in Pixel:",
+ "bs-avatars-upload-complete": "Das Bild wurde erfolgreich hochgeladen.",
+ "bs-avatars-generate-complete": "Es wurde ein neuer Avatar generiert.",
+ "bs-avatars-upload-title": "Profilbild ändern",
+ "bs-avatars-upload-label": "Bild",
+ "bs-avatars-generate-new-label": "Neuen Avatar generieren",
+ "bs-avatars-warning-title": "Warnung",
+ "bs-avatars-warning-text": "Du hast bereits ein Bild in deinen
Einstellungen hinterlegt. Wenn du Avatare benutzen, wird diese Einstellung
zurückgesetzt. Möchtest du fortfahren?",
+ "bs-avatars-userimage-title": "Wiki-Bild oder Bild-URL",
+ "bs-avatars-userimage-help": "Z.B. Picture.jpg oder
http://localhost/Picture.gif",
+ "bs-avatars-set-userimage-failed": "Keine gültige URL oder Wiki-Bild.",
+ "bs-avatars-set-userimage-saved": "Benutzerbild wurde gespeichert.",
+ "bs-avatars-file-upload-fieldset-title": "Bild hochladen",
+ "bs-avatars-auto-generate-fieldset-title": "Avatar automatisch
generieren"
+ }
diff --git a/Avatars/i18n/en.json b/Avatars/i18n/en.json
new file mode 100644
index 0000000..8c2dc4a
--- /dev/null
+++ b/Avatars/i18n/en.json
@@ -0,0 +1,25 @@
+{
+ "@metadata": {
+ "authors": [
+ "Marc Reymann <[email protected]>",
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "prefs-avatars": "Avatars",
+ "bs-avatars-desc": "Provides generic and individual user pictures",
+ "bs-avatars-pref-generator": "Generator:",
+ "bs-avatars-pref-defaultsize": "Default size in pixel:",
+ "bs-avatars-upload-complete": "The picture was uploaded successfully.",
+ "bs-avatars-generate-complete": "A new avatar was generated.",
+ "bs-avatars-upload-title": "Change profile picture",
+ "bs-avatars-upload-label": "Picture",
+ "bs-avatars-generate-new-label": "Generate new avatar",
+ "bs-avatars-warning-title": "Warning",
+ "bs-avatars-warning-text": "You have set a user picture in your
preferences. Using avatars will clear this setting. Do you want to proceed?",
+ "bs-avatars-userimage-title": "Picture from wiki or picture URL",
+ "bs-avatars-userimage-help": "e. g. Picture.jpg or
http://localhost/Picture.gif",
+ "bs-avatars-set-userimage-failed": "Not a valid URL or picture from
wiki.",
+ "bs-avatars-set-userimage-saved": "User picture successfully saved.",
+ "bs-avatars-file-upload-fieldset-title": "Picture upload",
+ "bs-avatars-auto-generate-fieldset-title": "Auto generate avatar"
+}
diff --git a/Avatars/i18n/qqq.json b/Avatars/i18n/qqq.json
new file mode 100644
index 0000000..f7fc885
--- /dev/null
+++ b/Avatars/i18n/qqq.json
@@ -0,0 +1,24 @@
+{
+ "@metadata": {
+ "authors": [
+ "Stephan Muggli <[email protected]>"
+ ]
+ },
+ "prefs-avatars": "Used in [[Special:Wiki_Admin&mode=Preferences]],
headline for avatars section in preferences.\\n{{Identical|Avatars}}",
+ "bs-avatars-desc": "Used in [[Special:Wiki_Admin&mode=ExtensionInfo]],
description of avatars extension",
+ "bs-avatars-pref-generator": "Option in
[[Special:Wiki_Admin&mode=Preferences]], label for avatar generator:",
+ "bs-avatars-pref-defaultsize": "Option in
[[Special:Wiki_Admin&mode=Preferences]], label for default size of avatar in
pixel:",
+ "bs-avatars-upload-complete": "Text for the picture was uploaded
successfully.",
+ "bs-avatars-generate-complete": "Text for a new avatar was generated.",
+ "bs-avatars-upload-title": "Window title for change profile picture",
+ "bs-avatars-upload-label": "Label for picture",
+ "bs-avatars-generate-new-label": "Label for generate new avatar",
+ "bs-avatars-warning-title": "Label for warning",
+ "bs-avatars-warning-text": "You have set a user picture in your
preferences. Using avatars will clear this setting. Do you want to proceed?",
+ "bs-avatars-userimage-title": "Fieldset title for picture from wiki or
picture URL",
+ "bs-avatars-userimage-help": "Help text for e.g. Picture.jpg or
http://localhost/Picture.gif \\n Picture.jpg is a example for a picture from
the wiki \\n http://localhost/Picture.gif is a example for a picture from url",
+ "bs-avatars-set-userimage-failed": "Text for not a valid picture from
wiki or picture URL.",
+ "bs-avatars-set-userimage-saved": "Text for user picture successfully
saved.",
+ "bs-avatars-file-upload-fieldset-title": "Fieldset title for picture
upload",
+ "bs-avatars-auto-generate-fieldset-title": "Fieldset title auto
generate avatar"
+}
diff --git a/Avatars/languages/Avatars.i18n.php
b/Avatars/languages/Avatars.i18n.php
index 5858d23..c67c9f9 100644
--- a/Avatars/languages/Avatars.i18n.php
+++ b/Avatars/languages/Avatars.i18n.php
@@ -1,62 +1,35 @@
<?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * 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
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
$messages = array();
+if ( !function_exists( 'wfJsonI18nShima896dc529c098d30' ) ) {
+ function wfJsonI18nShima896dc529c098d30( $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(
- 'Avatars' => 'Avatars',
- 'prefs-Avatars' => 'Avatars',
- 'bs-avatars-extension-description' => 'Provides
generic and individual user images.',
- 'bs-Avatars-pref-Generator' =>
'Generator',
- 'bs-Avatars-pref-DefaultSize' => 'Default
size (pixel)',
- 'bs-avatars-upload-complete' => 'The
picture was uploaded successfully.',
- 'bs-avatars-generate-complete' => 'A new
avatar was created.',
-
- //JavaScript
- 'bs-avatars-upload-title' => 'Change
profile image',
- 'bs-avatars-upload-label' => 'Picture',
- 'bs-avatars-generate-new-label' => 'Generate
new avatar',
- 'bs-avatars-warning-label' => 'Warning',
- 'bs-avatars-warning-text' => 'You have
set a user image in your preferences. Using avatars will clear this setting. Do
you want to proceed?',
- 'bs-avatars-userimage-label' => 'Wiki
image or image URL',
- 'bs-avatars-userimage-help' => 'e. g.
Image.jpg or http://localhost/image.gif',
- 'bs-avatars-set-userimage-failed' => 'Not a
valid URL or wiki image',
- 'bs-avatars-set-userimage-saved' => 'User
image successfully saved',
- 'bs-avatars-userimage-save-button' => 'Save',
- 'bs-avatars-cancel-button' => 'Cancel',
- 'bs-avatars-file-upload-fieldset-title' => 'Image
upload',
- 'bs-avatars-user-image-fieldset-title' => 'Wiki
image or image URL',
- 'bs-avatars-auto-generate-fieldset-title' => 'Auto
generate avatar'
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
-$messages['de'] = array(
- 'Avatars' =>
'Benutzerbilder',
- 'prefs-Avatars' =>
'Benutzerbilder',
- 'bs-avatars-extension-description' => 'Stellt
individuelle und generische Benutzerbilder bereit.',
- 'bs-Avatars-pref-Generator' =>
'Generator',
- 'bs-Avatars-pref-DefaultSize' =>
'Standardgröße (Pixel)',
- 'bs-avatars-upload-complete' => 'Das Bild
wurde erfolgreich hochgeladen.',
- 'bs-avatars-generate-complete' => 'Es wurde
ein neuer Avatar generiert.',
-
- //Javascript
- 'bs-avatars-upload-title' =>
'Profilbild ändern',
- 'bs-avatars-upload-label' => 'Bild',
- 'bs-avatars-generate-new-label' => 'Neuen
Avatar generieren',
- 'bs-avatars-warning-label' => 'Warnung',
- 'bs-avatars-warning-text' => 'Sie
haben bereits ein Bild in Ihren Einstellungen hinterlegt. Wenn Sie Avatare
benutzen, wird diese Einstellung zurückgesetzt. Möchten Sie fortfahren?',
- 'bs-avatars-userimage-label' =>
'Wiki-Bild oder Bild-URL',
- 'bs-avatars-userimage-help' => 'Z. B.
Image.jpg oder http://localhost/image.gif',
- 'bs-avatars-set-userimage-failed' => 'Keine
gültige URL oder Wiki-Bild',
- 'bs-avatars-set-userimage-saved' =>
'Benutzerbild wurde gespeichert',
- 'bs-avatars-userimage-save-button' =>
'Speichern',
- 'bs-avatars-cancel-button' =>
'Abbrechen',
- 'bs-avatars-file-upload-fieldset-title' => 'Bild
hochladen',
- 'bs-avatars-user-image-fieldset-title' =>
'Wiki-Bild oder Bild-URL',
- 'bs-avatars-auto-generate-fieldset-title' => 'Avatar
automatisch generieren'
-);
-
-$messages['qqq'] = array(
- 'Avatars' => 'Name of
the extension',
- 'prefs-Avatars' => 'Name of
the extension',
- 'bs-avatars-extension-description' =>
'Description of what the extension acually does',
- 'bs-Avatars-pref-Generator' => 'Pulldown
that selects an avatar generator',
- 'bs-Avatars-pref-DefaultSize' => 'Text
field that shows the avatar default size in pixels',
-);
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShima896dc529c098d30';
+}
--
To view, visit https://gerrit.wikimedia.org/r/134068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cec46852a4779b246d49796feb4d21b8f62008b
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: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits