Merge branch 'bug/38-portuguese'

Author: yamadapc

lib/i18n/pt.json

@@ -2,6 +2,7 @@
   "useLongScale": false,
   "baseSeparator": " e ",
   "unitSeparator": "e ",
+  "andWhenTrailing": true,
   "base": {
     "0": "zero",
     "1": "um",
@@ -42,17 +43,17 @@
     "900": "novecentos",
     "1000": "mil"
   },
-  "andException": {
-    "10": true
-  },
   "unitExceptions": {
     "1": "um"
   },
   "units" : [
     {
       "singular": "cento",
       "useBaseInstead": true,
-      "useBaseException": [1],
+      "useBaseException": [
+        1
+      ],
+      "useBaseExceptionWhenNoTrailingNumbers": true,
       "andException": true
     },
     {

lib/index.js

@@ -1,17 +1,17 @@
-'use strict';
+"use strict";
 exports = module.exports = writtenNumber;
-var util = require('./util');
+var util = require("./util");
 
-var languages = ['en', 'es', 'pt', 'fr', 'eo', 'it', 'vi'];
+var languages = ["en", "es", "pt", "fr", "eo", "it", "vi"];
 var i18n = {
-  en: require('./i18n/en.json'),
-  es: require('./i18n/es.json'),
-  pt: require('./i18n/pt.json'),
-  fr: require('./i18n/fr.json'),
-  eo: require('./i18n/eo.json'),
-  it: require('./i18n/it.json'),
-  vi: require('./i18n/vi.json'),
-  enIndian:  require('./i18n/en-indian.json'),
+  en: require("./i18n/en.json"),
+  es: require("./i18n/es.json"),
+  pt: require("./i18n/pt.json"),
+  fr: require("./i18n/fr.json"),
+  eo: require("./i18n/eo.json"),
+  it: require("./i18n/it.json"),
+  vi: require("./i18n/vi.json"),
+  enIndian: require("./i18n/en-indian.json")
 };
 exports.i18n = i18n;
 
@@ -27,7 +27,7 @@ for (i = 1; i <= 15; i++) {
 
 writtenNumber.defaults = {
   noAnd: false,
-  lang: 'en',
+  lang: "en"
 };
 
 /**
@@ -44,110 +44,143 @@ function writtenNumber(n, options) {
 
   n = Math.round(+n);
 
-  var language = typeof options.lang === 'string'
+  var language = typeof options.lang === "string"
     ? i18n[options.lang]
     : options.lang;
   var scale = language.useLongScale ? longScale : shortScale;
   var units = language.units;
   var unit;
 
-  
-  
-  if (! (units instanceof Array))
-  {
+  if (!(units instanceof Array)) {
     var rawUnits = units;
-    
+
     units = [];
     scale = Object.keys(rawUnits);
 
-    for (var i in scale)
-    {
-      units.push(rawUnits[scale[i]])
+    for (var i in scale) {
+      units.push(rawUnits[scale[i]]);
       scale[i] = Math.pow(10, parseInt(scale[i]));
     }
   }
 
-  
-  
-  
   if (!language) {
     if (languages.indexOf(writtenNumber.defaults.lang) < 0) {
-      writtenNumber.defaults.lang = 'en';
+      writtenNumber.defaults.lang = "en";
     }
+
     language = i18n[writtenNumber.defaults.lang];
   }
 
   var baseCardinals = language.base;
 
   if (language.unitExceptions[n]) return language.unitExceptions[n];
-  if(baseCardinals[n]) return baseCardinals[n];
-  if(n < 100) return handleSmallerThan100(n, language, unit, baseCardinals, options);
+  if (baseCardinals[n]) return baseCardinals[n];
+  if (n < 100)
+    return handleSmallerThan100(n, language, unit, baseCardinals, options);
 
   var m = n % 100;
   var ret = [];
-  if(m) {
-    if(options.noAnd && !(language.andException && language.andException[10])
-      ) {
-        ret.push(writtenNumber(m, options));
+
+  if (m) {
+    if (
+      options.noAnd &&
+      !(language.andException && language.andException[10])
+    ) {
+      ret.push(writtenNumber(m, options));
     } else {
       ret.push(language.unitSeparator + writtenNumber(m, options));
     }
-    n -= m;
-  } else ret = [];
+  }
+
+  var firstSignificant;
 
-  for(var i = 0, len = units.length; i < len; i++) {
+  for (var i = 0, len = units.length; i < len; i++) {
     var r = Math.floor(n / scale[i]);
-  
-    if (i == len - 1)
-      var divideBy = 1000000;
-    else 
-      var divideBy = scale[i+1] / scale[i];
-      
+    var divideBy;
+
+    if (i === len - 1) divideBy = 1000000;
+    else divideBy = scale[i + 1] / scale[i];
+
     r %= divideBy;
 
     unit = units[i];
 
-    if(r && unit.useBaseInstead) {
-      if(unit.useBaseException.indexOf(r) < 0) {
+    if (!r) continue;
+    firstSignificant = scale[i];
+
+    if (unit.useBaseInstead) {
+      var shouldUseBaseException =
+        unit.useBaseException.indexOf(r) > -1 &&
+        (unit.useBaseExceptionWhenNoTrailingNumbers
+          ? i === 0 && ret.length
+          : true);
+      if (!shouldUseBaseException) {
         ret.push(baseCardinals[r * scale[i]]);
-      }
-      else {
+      } else {
         ret.push(r > 1 && unit.plural ? unit.plural : unit.singular);
       }
+      continue;
     }
-    else if(r) {
-      var str;
-      if(typeof unit === 'string') {
-        str = unit;
-      }
-      else {
-        str = r > 1 && unit.plural && (!unit.avoidInNumberPlural || !m) ? unit.plural : unit.singular;
-      }
-      if(unit.avoidPrefixException && unit.avoidPrefixException.indexOf(r) > -1) {
-        ret.push(str);
-      }
-      else {
-        var exception = language.unitExceptions[r];
-        var number = exception || writtenNumber(r, util.defaults({
-          // Languages with and exceptions need to set `noAnd` to false
-          noAnd: !(language.andException && language.andException[r] ||
-                   unit.andException) &&
-                 true,
-        }, options));
-        ret.push(number + ' ' + str);
-      }
+
+    var str;
+    if (typeof unit === "string") {
+      str = unit;
+    } else {
+      str = r > 1 && unit.plural && (!unit.avoidInNumberPlural || !m)
+        ? unit.plural
+        : unit.singular;
+    }
+
+    if (
+      unit.avoidPrefixException &&
+      unit.avoidPrefixException.indexOf(r) > -1
+    ) {
+      ret.push(str);
+      continue;
     }
 
+    var exception = language.unitExceptions[r];
+    var number =
+      exception ||
+      writtenNumber(
+        r,
+        util.defaults(
+          {
+            // Languages with and exceptions need to set `noAnd` to false
+            noAnd: !((language.andException && language.andException[r]) ||
+              unit.andException) && true
+          },
+          options
+        )
+      );
+    n -= r * scale[i];
+    ret.push(number + " " + str);
+  }
+
+  var firstSignificantN = firstSignificant * Math.floor(n / firstSignificant);
+  var rest = n - firstSignificantN;
+
+  if (
+    language.andWhenTrailing &&
+    firstSignificant &&
+    0 < rest &&
+    ret[0].indexOf(language.unitSeparator) !== 0
+  ) {
+    ret = [ret[0], language.unitSeparator.replace(/\s+$/, "")].concat(
+      ret.slice(1)
+    );
   }
-  return ret.reverse().join(' ');
+
+  return ret.reverse().join(" ");
 }
 
 function handleSmallerThan100(n, language, unit, baseCardinals, options) {
   var dec = Math.floor(n / 10) * 10;
   unit = n - dec;
-  if(unit) {
-    return baseCardinals[dec] + language.baseSeparator + writtenNumber(unit, options);
+  if (unit) {
+    return (
+      baseCardinals[dec] + language.baseSeparator + writtenNumber(unit, options)
+    );
   }
   return baseCardinals[dec];
 }
-

lib/util.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 /**
  * Merges a set of default keys with a target object
  * (Like _.defaults, but will also extend onto null/undefined)
@@ -9,10 +9,10 @@
  */
 
 function defaults(target, defs) {
-  if(target == null) target = {};
+  if (target == null) target = {};
   var ret = {};
   var keys = Object.keys(defs);
-  for(var i = 0, len = keys.length; i < len; i++) {
+  for (var i = 0, len = keys.length; i < len; i++) {
     var key = keys[i];
     ret[key] = target[key] || defs[key];
   }