فهرست منبع

fix localization

Markus-Rost 4 سال پیش
والد
کامیت
07ee5c99d9
2فایلهای تغییر یافته به همراه12 افزوده شده و 12 حذف شده
  1. 6 6
      cmds/wiki/user.js
  2. 6 6
      i18n/en.json

+ 6 - 6
cmds/wiki/user.js

@@ -98,9 +98,9 @@ function gamepedia_user(lang, msg, namespace, username, wiki, querystring, fragm
 				let datediff = datetimeDifference(blockedtimestamp, expiry);
 				let seperator = lang.get('user.block.duration.seperator_last').replace( /_/g, ' ' );
 				let last_seperator = true;
-				if ( datediff.minutes ) blockduration = lang.get('user.block.duration.minutes', datediff.minutes);
+				if ( datediff.minutes ) blockduration = lang.get('user.block.duration.minutes', datediff.minutes.toLocaleString(lang.get('dateformat')), datediff.minutes);
 				if ( datediff.hours ) {
-					blockduration = lang.get('user.block.duration.hours', datediff.hours) + ( blockduration.length ? seperator + blockduration : '' );
+					blockduration = lang.get('user.block.duration.hours', datediff.hours.toLocaleString(lang.get('dateformat')), datediff.hours) + ( blockduration.length ? seperator + blockduration : '' );
 					if ( last_seperator ) {
 						seperator = lang.get('user.block.duration.seperator').replace( /_/g, ' ' );
 						last_seperator = false;
@@ -108,14 +108,14 @@ function gamepedia_user(lang, msg, namespace, username, wiki, querystring, fragm
 				}
 				if ( datediff.days ) {
 					if ( datediff.days % 7 ) {
-						blockduration = lang.get('user.block.duration.days', datediff.days % 7) + ( blockduration.length ? seperator + blockduration : '' );
+						blockduration = lang.get('user.block.duration.days', ( datediff.days % 7 ).toLocaleString(lang.get('dateformat')), datediff.days % 7) + ( blockduration.length ? seperator + blockduration : '' );
 						if ( last_seperator ) {
 							seperator = lang.get('user.block.duration.seperator').replace( /_/g, ' ' );
 							last_seperator = false;
 						}
 					}
 					if ( ( datediff.days / 7 ) >> 0 ) {
-						blockduration = lang.get('user.block.duration.weeks', ( datediff.days / 7 ) >> 0 ) + ( blockduration.length ? seperator + blockduration : '' );
+						blockduration = lang.get('user.block.duration.weeks', ( ( datediff.days / 7 ) >> 0 ).toLocaleString(lang.get('dateformat')), ( datediff.days / 7 ) >> 0 ) + ( blockduration.length ? seperator + blockduration : '' );
 						if ( last_seperator ) {
 							seperator = lang.get('user.block.duration.seperator').replace( /_/g, ' ' );
 							last_seperator = false;
@@ -123,14 +123,14 @@ function gamepedia_user(lang, msg, namespace, username, wiki, querystring, fragm
 					}
 				}
 				if ( datediff.months ) {
-					blockduration = lang.get('user.block.duration.months', datediff.months) + ( blockduration.length ? seperator + blockduration : '' );
+					blockduration = lang.get('user.block.duration.months', datediff.months.toLocaleString(lang.get('dateformat')), datediff.months) + ( blockduration.length ? seperator + blockduration : '' );
 					if ( last_seperator ) {
 						seperator = lang.get('user.block.duration.seperator').replace( /_/g, ' ' );
 						last_seperator = false;
 					}
 				}
 				if ( datediff.years ) {
-					blockduration = lang.get('user.block.duration.years', datediff.years) + ( blockduration.length ? seperator + blockduration : '' );
+					blockduration = lang.get('user.block.duration.years', datediff.years.toLocaleString(lang.get('dateformat')), datediff.years) + ( blockduration.length ? seperator + blockduration : '' );
 					if ( last_seperator ) {
 						seperator = lang.get('user.block.duration.seperator').replace( /_/g, ' ' );
 						last_seperator = false;

+ 6 - 6
i18n/en.json

@@ -686,14 +686,14 @@
     "user": {
         "block": {
             "duration": {
-                "days": "$1 {{PLURAL:$1|day|days}}",
-                "hours": "$1 {{PLURAL:$1|hour|hours}}",
-                "minutes": "$1 {{PLURAL:$1|minute|minutes}}",
-                "months": "$1 {{PLURAL:$1|month|months}}",
+                "days": "$1 {{PLURAL:$2|day|days}}",
+                "hours": "$1 {{PLURAL:$2|hour|hours}}",
+                "minutes": "$1 {{PLURAL:$2|minute|minutes}}",
+                "months": "$1 {{PLURAL:$2|month|months}}",
                 "seperator": ",_",
                 "seperator_last": "_and_",
-                "weeks": "$1 {{PLURAL:$1|week|weeks}}",
-                "years": "$1 {{PLURAL:$1|year|years}}"
+                "weeks": "$1 {{PLURAL:$2|week|weeks}}",
+                "years": "$1 {{PLURAL:$2|year|years}}"
             },
             "header": "$1 is currently blocked!",
             "indef_noreason": "Blocked indefinitely on $1 by $4.",