Revision: 46194
Author: siebrand
Date: 2009-01-25 11:56:49 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Remove 'amazonplus-status-sep' and use 'comma-separator' from core
Modified Paths:
--------------
trunk/extensions/AmazonPlus/AmazonPlus.i18n.php
trunk/extensions/AmazonPlus/AmazonPlus.php
trunk/extensions/Translate/groups/mediawiki-defines.txt
Modified: trunk/extensions/AmazonPlus/AmazonPlus.i18n.php
===================================================================
--- trunk/extensions/AmazonPlus/AmazonPlus.i18n.php 2009-01-25 11:29:26 UTC
(rev 46193)
+++ trunk/extensions/AmazonPlus/AmazonPlus.i18n.php 2009-01-25 11:56:49 UTC
(rev 46194)
@@ -25,7 +25,6 @@
'amazonplus-amazon' => 'amazon price',
'amazonplus-new' => 'new',
'amazonplus-status' => '($1)',
- 'amazonplus-status-sep' => ', ',
'amazonplus-none' => 'No copies of this item are up for sale.',
'amazonplus-currency' => '$3$1 $2$4',
'amazonplus-cp-none' => 'None',
@@ -54,7 +53,6 @@
'amazonplus-japanese' => 'Name of the Japanese language, or an empty
string if translating to Japanese.',
'amazonplus-english' => 'Name of the English language, or an empty
string if translating to English.',
'amazonplus-status' => ';$1:A combination of status messages seperated
with [[MediaWiki:Amazonplus-status-sep/en|amazonplus-status-sep]]',
- 'amazonplus-status-sep' => 'Seperator used in
[[MediaWiki:Amazonplus-status/en|amazonplus-status]] to divide the listing of
terms',
'amazonplus-currency' => ';$1:Formatted price without symbol (e.g.
16.41)
;$2:Currency code (e.g. USD)
;$3:Currency symbol (e.g. $)
@@ -100,7 +98,6 @@
'amazonplus-japanese' => 'يابانية',
'amazonplus-amazon' => 'سعر أمازون',
'amazonplus-new' => 'جديد',
- 'amazonplus-status-sep' => ',',
'amazonplus-none' => 'مافيش نسخ من الصنف دا معروضه للبيع',
'amazonplus-cp-none' => 'لا شيء',
'amazonplus-more' => 'أكثر',
@@ -245,7 +242,6 @@
'amazonplus-amazon' => 'amazon prezioa',
'amazonplus-new' => 'berria',
'amazonplus-status' => '($1)',
- 'amazonplus-status-sep' => ',',
'amazonplus-none' => 'Ez dago artikulu honen kopiarik salgai.',
'amazonplus-currency' => '$1$3 $4$2',
'amazonplus-cp-none' => 'Bat ere ez',
@@ -474,7 +470,6 @@
'amazonplus-amazon' => 'dä Priiß bei <i lang="en">Amazon</i>',
'amazonplus-new' => 'neu',
'amazonplus-status' => '($1)',
- 'amazonplus-status-sep' => ',',
'amazonplus-none' => 'Et es jraad kei Stöck dovun em Aanjebott.',
'amazonplus-currency' => '$3$1 $2$4',
'amazonplus-cp-none' => 'Nix',
@@ -717,7 +712,6 @@
'amazonplus-amazon' => 'cena na Amazon',
'amazonplus-new' => 'nové',
'amazonplus-status' => '($1)',
- 'amazonplus-status-sep' => ',',
'amazonplus-none' => 'Nepredávajú sa žiadne kópie tejto položky.',
'amazonplus-currency' => '$3$1 $2$4',
'amazonplus-cp-none' => 'Žiadne',
@@ -798,7 +792,6 @@
'amazonplus-amazon' => 'amazon fiyatı',
'amazonplus-new' => 'yeni',
'amazonplus-status' => '($1)',
- 'amazonplus-status-sep' => ',',
'amazonplus-none' => 'Bu ürünün hiçbir kopyası satılık değil.',
'amazonplus-currency' => '$1$3 $2$4',
'amazonplus-cp-none' => 'Hiç',
Modified: trunk/extensions/AmazonPlus/AmazonPlus.php
===================================================================
--- trunk/extensions/AmazonPlus/AmazonPlus.php 2009-01-25 11:29:26 UTC (rev
46193)
+++ trunk/extensions/AmazonPlus/AmazonPlus.php 2009-01-25 11:56:49 UTC (rev
46194)
@@ -437,7 +437,7 @@
foreach ( $extra as $val ) {
$msg = wfMsg( $val );
if ( $msg == '' ) continue;
- if ( $i++ != 0 ) $params .= wfMsg(
'amazonplus-status-sep' );
+ if ( $i++ != 0 ) $params .= wfMsg( 'comma-separator' );
$params .= $msg;
}
if ( $params ) $app = ' ' . wfMsg( 'amazonplus-status', $params
);
Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt
===================================================================
--- trunk/extensions/Translate/groups/mediawiki-defines.txt 2009-01-25
11:29:26 UTC (rev 46193)
+++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2009-01-25
11:56:49 UTC (rev 46194)
@@ -17,7 +17,7 @@
descmsg = ajax-se-desc
Amazon Plus
-optional = amazonplus-status, amazonplus-status-sep, amazonplus-currency
+optional = amazonplus-status, amazonplus-currency
optional = amazonplus-cp-usd, amazonplus-cp-cad, amazonplus-cp-gbp,
amazonplus-cp-eur
optional = amazonplus-cp-jpy
ignored = amazonplus-english
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
