[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up e8dd1f43fb169: fix JS error when $wgTranslateNumer...

2016-12-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326175 )

Change subject: Follow-up e8dd1f43fb169: fix JS error when $wgTranslateNumerals 
is false
..


Follow-up e8dd1f43fb169: fix JS error when $wgTranslateNumerals is false

Bug: T152800
Change-Id: I99c341168dada063876a66689d68e0b9adf7f09a
---
M resources/src/mediawiki.language/mediawiki.language.numbers.js
1 file changed, 10 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js 
b/resources/src/mediawiki.language/mediawiki.language.numbers.js
index 10ceecc..83277cb 100644
--- a/resources/src/mediawiki.language/mediawiki.language.numbers.js
+++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js
@@ -223,13 +223,17 @@
numberString = mw.language.commafy( num, 
pattern );
}
 
-   convertedNumber = '';
-   for ( i = 0; i < numberString.length; i++ ) {
-   if ( transformTable.hasOwnProperty( 
numberString[ i ] ) ) {
-   convertedNumber += transformTable[ 
numberString[ i ] ];
-   } else {
-   convertedNumber += numberString[ i ];
+   if ( transformTable ) {
+   convertedNumber = '';
+   for ( i = 0; i < numberString.length; i++ ) {
+   if ( transformTable.hasOwnProperty( 
numberString[ i ] ) ) {
+   convertedNumber += 
transformTable[ numberString[ i ] ];
+   } else {
+   convertedNumber += 
numberString[ i ];
+   }
}
+   } else {
+   convertedNumber = numberString;
}
 
if ( integer ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/326175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I99c341168dada063876a66689d68e0b9adf7f09a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up e8dd1f43fb169: fix JS error when $wgTranslateNumer...

2016-12-09 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326175 )

Change subject: Follow-up e8dd1f43fb169: fix JS error when $wgTranslateNumerals 
is false
..

Follow-up e8dd1f43fb169: fix JS error when $wgTranslateNumerals is false

Bug: T152800
Change-Id: I99c341168dada063876a66689d68e0b9adf7f09a
---
M resources/src/mediawiki.language/mediawiki.language.numbers.js
1 file changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/326175/1

diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js 
b/resources/src/mediawiki.language/mediawiki.language.numbers.js
index 10ceecc..83277cb 100644
--- a/resources/src/mediawiki.language/mediawiki.language.numbers.js
+++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js
@@ -223,13 +223,17 @@
numberString = mw.language.commafy( num, 
pattern );
}
 
-   convertedNumber = '';
-   for ( i = 0; i < numberString.length; i++ ) {
-   if ( transformTable.hasOwnProperty( 
numberString[ i ] ) ) {
-   convertedNumber += transformTable[ 
numberString[ i ] ];
-   } else {
-   convertedNumber += numberString[ i ];
+   if ( transformTable ) {
+   convertedNumber = '';
+   for ( i = 0; i < numberString.length; i++ ) {
+   if ( transformTable.hasOwnProperty( 
numberString[ i ] ) ) {
+   convertedNumber += 
transformTable[ numberString[ i ] ];
+   } else {
+   convertedNumber += 
numberString[ i ];
+   }
}
+   } else {
+   convertedNumber = numberString;
}
 
if ( integer ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/326175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99c341168dada063876a66689d68e0b9adf7f09a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits