http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66588
Revision: 66588
Author: dale
Date: 2010-05-17 20:55:16 +0000 (Mon, 17 May 2010)
Log Message:
-----------
made mw.includeAllModuleMessages call consistent with documentation
switched uploadWizard over to mw.includeAllModuleMessages call.
Modified Paths:
--------------
trunk/extensions/JS2Support/README
trunk/extensions/JS2Support/mwEmbed/jsScriptLoader.php
trunk/extensions/UploadWizard/js/mw.UploadWizard.js
Modified: trunk/extensions/JS2Support/README
===================================================================
--- trunk/extensions/JS2Support/README 2010-05-17 20:25:56 UTC (rev 66587)
+++ trunk/extensions/JS2Support/README 2010-05-17 20:55:16 UTC (rev 66588)
@@ -229,7 +229,7 @@
Running the JS2Support maintenance script "mergeJavascriptMsgs.php" will sync
javascript into phpt files.
This is the most complicated setup, if your unsure use the first option and
call:
-mw.includeAllModuleMsgs();
+mw.includeAllModuleMessages();
In your primary library code javascript.
=== Accessing Msgs in Javascript ===
Modified: trunk/extensions/JS2Support/mwEmbed/jsScriptLoader.php
===================================================================
--- trunk/extensions/JS2Support/mwEmbed/jsScriptLoader.php 2010-05-17
20:25:56 UTC (rev 66587)
+++ trunk/extensions/JS2Support/mwEmbed/jsScriptLoader.php 2010-05-17
20:55:16 UTC (rev 66588)
@@ -51,7 +51,7 @@
// The raw requested class
private static $rawClassList = '';
- private static $includeAllMsgsRegEx =
"/mw\.includeAllModuleMsgs\s*\(\s*\)\;?/";
+ private static $includeAllMsgsRegEx =
"/mw\.includeAllModuleMessages\s*\(\s*\)\;?/";
/**
* Output the javascript from cache
Modified: trunk/extensions/UploadWizard/js/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/js/mw.UploadWizard.js 2010-05-17 20:25:56 UTC
(rev 66587)
+++ trunk/extensions/UploadWizard/js/mw.UploadWizard.js 2010-05-17 20:55:16 UTC
(rev 66588)
@@ -1,115 +1,11 @@
-mw.addMessages( {
- "mwe-upwiz-step-file": "1. Upload your files",
- "mwe-upwiz-step-deeds": "2. Add licenses",
- "mwe-upwiz-step-details": "3. Add descriptions",
- "mwe-upwiz-step-thanks": "4. Use your files",
- "mwe-upwiz-intro": "Welcome to Wikimedia Commons, a repository of
images, sounds, and movies that anyone can freely download and use. Add to
humanity's knowledge by uploading files that could be used for an educational
purpose.",
- // XXX maybe use mediawiki PLURAL here
- "mwe-upwiz-add-file-n": "Add another file",
- "mwe-upwiz-add-file-0": "Click here to add a file for upload",
- "mwe-upwiz-browse": "Browse...",
- "mwe-upwiz-transported": "OK",
- "mwe-upwiz-click-here": "Click here to select a file",
- "mwe-upwiz-uploading": "uploading...",
- "mwe-upwiz-editing": "editing...",
- "mwe-upwiz-remove-upload": "Remove this file from the list of files to
upload",
- "mwe-upwiz-remove-description": "Remove this description",
- "mwe-upwiz-upload": "Upload",
- "mwe-upwiz-upload-count": "$1 {{PLURAL:$1|file|files}} of $2 uploaded",
- "mwe-upwiz-progressbar-uploading": "uploading",
- "mwe-upwiz-hrs-mins-secs-remaining": "$1 {{PLURAL:$1|hour|hours}}, $2
{{PLURAL:$2|minute|minutes}}, $3 {{PLURAL:$3|second|seconds}} remaining",
- "mwe-upwiz-mins-secs-remaining": "$1 {{PLURAL:$1|minute|minutes}}, $2
{{PLURAL:$2|second|seconds}} remaining",
- "mwe-upwiz-secs-remaining": "$1 {{PLURAL:$1|second|seconds}} remaining",
- // XXX use mediawiki plurals
- "mwe-upwiz-deeds-intro": "Thank you! Now we need to set a license for
these files, so everyone can legally view or modify them. First, we'll have to
know where you got them.",
- // XXX use mediawiki plurals
- "mwe-upwiz-details-intro": "Now we need some basic information about
the files.",
- "mwe-upwiz-source-ownwork": "This file is my own work.",
- // XXX use mediawiki plurals
- "mwe-upwiz-source-ownwork-plural": "These files are my own work.",
- "mwe-upwiz-source-ownwork-assert": "I, $1, the copyright holder of this
work, hereby grant anyone the right to use this work for any purpose, as long
as they credit me and share derivative work under the same terms.",
- "mwe-upwiz-source-ownwork-assert-plural": "I, $1, the copyright holder
of these works, hereby grant anyone the right to use these works for any
purpose, as long as they credit me and share derivative work under the same
terms.",
- "mwe-upwiz-source-ownwork-assert-custom": "I, $1, the copyright holder
of this work, hereby publish this work under the following license(s):",
- "mwe-upwiz-source-ownwork-assert-custom-plural": "I, $1, the copyright
holder of these works, hereby publish these works under the following
license(s):",
- "mwe-upwiz-source-ownwork-assert-note": "This means you release your
work under a double Creative Commons Attribution ShareAlike and GFDL license.",
- "mwe-upwiz-source-permission": "Their author gave you explicit
permission to upload them",
- "mwe-upwiz-source-thirdparty": "This file is not my own work.",
- // XXX use mediawiki plurals
- "mwe-upwiz-source-thirdparty-plural": "These files are not my own
work.",
- "mwe-upwiz-source-thirdparty-intro" : "Please enter the address where
you found each file.",
- "mwe-upwiz-source-thirdparty-custom-plural-intro" : "If all files have
the same source, author, and copyright status, you may enter them only once for
all of them.",
- "mwe-upwiz-source-thirdparty-license" : "The copyright holder of this
work published it under the following license(s):",
- // XXX use mediawiki plurals
- "mwe-upwiz-source-thirdparty-license-plural" : "The copyright holder of
these works published them under the following license(s):",
- "mwe-upwiz-source-thirdparty-accept": "OK",
- "mwe-upwiz-source-custom": "Did you know? You can <a
href=\"$1\">customize</a> the default options you see here.",
- "mwe-upwiz-more-options": "more options...",
- "mwe-upwiz-fewer-options": "fewer options...",
- "mwe-upwiz-desc": "Description in",
- // XXX use mediawiki PLURAL
- "mwe-upwiz-desc-add-n": "add a description in another language",
- "mwe-upwiz-desc-add-0": "add a description",
- "mwe-upwiz-title": "Title",
- "mwe-upwiz-categories-intro": "Help people find your works by adding
categories",
- "mwe-upwiz-categories-another": "Add other categories",
- "mwe-upwiz-previously-uploaded": "This file was previously uploaded to
$1 and is already available <a href=\"$2\">here</a>.",
- "mwe-upwiz-about-this-work": "About this work",
- "mwe-upwiz-media-type": "Media type",
- "mwe-upwiz-date-created": "Date created",
- "mwe-upwiz-location": "Location",
- "mwe-upwiz-copyright-info": "Copyright information",
- "mwe-upwiz-author": "Author(s)",
- "mwe-upwiz-license": "License",
- "mwe-upwiz-about-format": "About the file",
- "mwe-upwiz-autoconverted": "This file was automatically converted to
the $1 format",
- "mwe-upwiz-filename-tag": "File name:",
- "mwe-upwiz-other": "Other information",
- "mwe-upwiz-other-prefill": "Free wikitext field",
- "mwe-upwiz-showall": "show all",
- "mwe-upwiz-source": "Source",
- "mwe-upwiz-macro-edit-intro": "Choose a license first above, then you
can add some descriptions and other information to your uploads.",
- "mwe-upwiz-macro-edit": "Update descriptions",
- "mwe-upwiz-thanks-intro": "Thanks for uploading your works! You can now
use your files on pages or link to them from elsewhere on the web.",
- "mwe-upwiz-thanks-link": "This file is now available at
<b><tt>$1</tt></b>.",
- "mwe-upwiz-thanks-wikitext": "<b>To use the file</b>, copy this text
into a page:",
- "mwe-upwiz-thanks-url": "<b>To link to it in HTML</b>, copy this HTML
code: ",
+/**
+ * Include all the uploadWizard msgs
+ */
- "mwe-upwiz-upload-error-bad-filename-extension": "This wiki does not
accept filenames with the extension \"$1\".",
- "mwe-upwiz-upload-error-duplicate": "This file was previously uploaded
to this wiki.",
- "mwe-upwiz-upload-error-stashed-anyway": "Post anyway?",
- "mwe-upwiz-ok": "OK",
- "mwe-upwiz-cancel": "Cancel",
- "mwe-upwiz-change": "(change)",
+mw.includeAllModuleMessages();
- "mwe-upwiz-fileexists" : "A file with this name exists already. Please
check <b><tt>$1<\/tt><\/b> if you are not sure if you want to replace it.",
- "mwe-upwiz-thumbnail-more" : "Enlarge",
- "mwe-upwiz-overwrite" : "Replace the file",
- "mwe-copyright-macro": "As above",
- "mwe-copyright-custom": "Custom",
-
- "mwe-upwiz-next": "Next",
- "mwe-upwiz-home": "Go to wiki home page",
- "mwe-upwiz-upload-another": "Upload more files",
-
- "mwe-prevent-close": "Your files are still uploading. Are you sure you
want to navigate away from this page?",
-
- "mwe-upwiz-files-complete": "Your files finished uploading!",
- "mwe-upwiz-deeds-later": "Set deeds and licenses for each file
individually on the next page",
-
- "mwe-upwiz-tooltip-author": "The name of the person who took the photo,
or painted the picture, drew the drawing, etc.",
- "mwe-upwiz-tooltip-source": "Where this digital file came from -- could
be a URL, or a book or publication",
- "mwe-upwiz-tooltip-sign": "You can use your wiki User name or your real
name. In both cases, this will be linked to your wiki User page",
- "mwe-upwiz-tooltip-title": "A short title for the image. You may use
plain language with spaces, but no line breaks. This title must be unlike all
other titles in this wiki.",
- "mwe-upwiz-tooltip-description": "Briefly describe everything notable
about the work. For a photo, mention the main things that are depicted, the
occasion or the place.",
- "mwe-upwiz-tooltip-other": "Any other information you want to include
about this work. You may use wikitext code.",
-
- "mwe-upwiz-tooltip-more-info": "Learn more."
-
-} );
-
-
/**
*
*/
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
