Add 'Location:' to the location message

Actually it's a totally new message, but still.

Change-Id: I5c02b9ec59bd0c8e455aae71936625a1bae48700
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/121
This commit is contained in:
Mark Holmquist 2014-01-21 17:32:19 -08:00
parent ac8d1eec0c
commit 47cad0e607
4 changed files with 21 additions and 16 deletions

View file

@ -69,6 +69,7 @@ $messages['en'] = array(
'multimediaviewer-geoloc-west' => 'W',
'multimediaviewer-geoloc-coord' => '$1° $2 $3″ $4',
'multimediaviewer-geoloc-coords' => '$1, $2',
'multimediaviewer-geolocation' => 'Location: $1',
);
/** Message documentation (Message documentation)
@ -172,6 +173,7 @@ Used as <code>$4</code> in {{msg-mw|Multimediaviewer-geoloc-coord}}.',
* $1 - the latitude
* $2 - the longitude
Both are formatted according to {{msg-mw|Multimediaviewer-geoloc-coord}}.',
'multimediaviewer-geolocation' => 'Message for displaying a location, formatted by {{msg-mw|Multimediaviewer-geoloc-coords}}, which is passed in as $1.',
);
/** Arabic (العربية)

View file

@ -151,6 +151,7 @@ $wgResourceModules['ext.multimediaViewer'] = array_merge( array(
'multimediaviewer-geoloc-west',
'multimediaviewer-geoloc-coord',
'multimediaviewer-geoloc-coords',
'multimediaviewer-geolocation',
),
), $moduleInfoMMV );

View file

@ -588,23 +588,25 @@
latitude, longitude, langcode, titleText
) {
this.$location.text(
mw.message(
'multimediaviewer-geoloc-coords',
mw.message( 'multimediaviewer-geolocation',
mw.message(
'multimediaviewer-geoloc-coord',
mw.language.convertNumber( latdeg ),
mw.language.convertNumber( latmin ),
mw.language.convertNumber( latsec ),
mw.message( latmsg ).text()
).text(),
'multimediaviewer-geoloc-coords',
mw.message(
'multimediaviewer-geoloc-coord',
mw.language.convertNumber( longdeg ),
mw.language.convertNumber( longmin ),
mw.language.convertNumber( longsec ),
mw.message( longmsg ).text()
mw.message(
'multimediaviewer-geoloc-coord',
mw.language.convertNumber( latdeg ),
mw.language.convertNumber( latmin ),
mw.language.convertNumber( latsec ),
mw.message( latmsg ).text()
).text(),
mw.message(
'multimediaviewer-geoloc-coord',
mw.language.convertNumber( longdeg ),
mw.language.convertNumber( longmin ),
mw.language.convertNumber( longsec ),
mw.message( longmsg ).text()
).text()
).text()
).text()
);

View file

@ -154,7 +154,7 @@
assert.strictEqual(
lightbox.$location.text(),
'50° 10 20″ N, 70° 30 40″ E',
'Location: 50° 10 20″ N, 70° 30 40″ E',
'Location text is set as expected - if this fails it may be due to i18n issues.'
);