同步源仓库到Fock仓库 (#1)

* ⭐ new(path): Keypath should parse if sub path contains spaces. (kazupon#533) by @exoego * feat(path): Keypath should parse if sub path contains spaces. * feat(path): Added test for whitespaces * 📝 docs(vuepress): pluralization will not work unless you use $tc (kazupon#540) by @lebesnec * ⭐ new(number): i18n-n functional component (kazupon#541) by @bponomarenko
xuhongbo · Mar 25, 2019 · 8f8a88b · 8f8a88b
1 parent dee637d
commit 8f8a88b
Show file tree

Hide file tree

Showing 19 changed files with 682 additions and 34 deletions.
diff --git a/decls/i18n.js b/decls/i18n.js
@@ -50,6 +50,15 @@ declare type DateTimeFormatResult = string;
 declare type NumberFormatResult = string;
 declare type MissingHandler = (locale: Locale, key: Path, vm?: any) => string | void;
 
+declare type FormattedNumberPartType = 'currency' | 'decimal' | 'fraction' | 'group' | 'infinity' | 'integer' | 'literal' | 'minusSign' | 'nan' | 'plusSign' | 'percentSign';
+declare type FormattedNumberPart = {
+  type: FormattedNumberPartType,
+  value: string,
+};
+// This array is the same as Intl.NumberFormat.formatToParts() return value:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat/formatToParts#Return_value
+declare type NumberFormatToPartsResult = Array<FormattedNumberPart>;
+
 declare type I18nOptions = {
   locale?: Locale,
   fallbackLocale?: Locale,

diff --git a/examples/number-formatting/index.html b/examples/number-formatting/index.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>number custom formatting</title>
+    <script src="../../node_modules/vue/dist/vue.min.js"></script>
+    <script src="../../dist/vue-i18n.min.js"></script>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.ja,Intl.~locale.en"></script>
+  </head>
+  <body>
+    <div id="app">
+      <select v-model="locale">
+        <option value="en-US">en-US</option>
+        <option value="ja-JP">ja-JP</option>
+      </select>
+      <p>
+        {{ $t('money') }}:
+        <i18n-n :value="money" format="currency">
+          <template slot="decimal" slot-scope="props"><!-- do not render decimal separator --></template>
+          <span slot="fraction" slot-scope="props" style="vertical-align: super">{{ props.fraction }}</span>
+        </i18n-n>
+      </p>
+    </div>
+    <script>
+      var messages = {
+        'en-US': {
+          money: 'Money'
+        },
+        'ja-JP': {
+          money: 'お金'
+        }
+      }
+      var numberFormats = {
+        'en-US': {
+          currency: {
+            style: 'currency', currency: 'USD'
+          }
+        },
+        'ja-JP': {
+          currency: {
+            style: 'currency', currency: 'JPY', currencyDisplay: 'symbol'
+          }
+        }
+      }
+
+      Vue.use(VueI18n)
+
+      var initial = 'ja-JP'
+      var i18n = new VueI18n({
+        locale: initial,
+        messages: messages,
+        numberFormats: numberFormats
+      })
+
+      new Vue({
+        i18n: i18n,
+        data: {
+          locale: initial,
+          money: 1000
+        },
+        watch: {
+          locale: function (val) {
+            this.$i18n.locale = val
+          }
+        },
+        el: '#app'
+      })
+    </script>
+  </body>
+</html>
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "dist/vue-i18n.min.js",
     "dist/vue-i18n.common.js",
     "dist/vue-i18n.esm.js",
-    "src/*.js",
+    "src/**/*.js",
     "types/*.d.ts",
     "decls"
   ],

diff --git a/src/component.js → src/components/interpolation.js b/src/component.js → src/components/interpolation.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { warn } from './util'
+import { warn } from '../util'
 
 export default {
   name: 'i18n',

diff --git a/src/components/number.js b/src/components/number.js
@@ -0,0 +1,63 @@
+/* @flow */
+
+import { warn, isObject, numberFormatKeys } from '../util'
+
+export default {
+  name: 'i18n-n',
+  functional: true,
+  props: {
+    tag: {
+      type: String,
+      default: 'span'
+    },
+    value: {
+      type: Number,
+      required: true
+    },
+    format: {
+      type: [String, Object]
+    },
+    locale: {
+      type: String
+    }
+  },
+  render (h: Function, { props, parent, data }: Object) {
+    const i18n = parent.$i18n
+
+    if (!i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!')
+      }
+      return null
+    }
+
+    let key: ?string = null
+    let options: ?NumberFormatOptions = null
+
+    if (typeof props.format === 'string') {
+      key = props.format
+    } else if (isObject(props.format)) {
+      if (props.format.key) {
+        key = props.format.key
+      }
+
+      // Filter out number format options only
+      options = Object.keys(props.format).reduce((acc, prop) => {
+        if (numberFormatKeys.includes(prop)) {
+          return Object.assign({}, acc, { [prop]: props.format[prop] })
+        }
+        return acc
+      }, null)
+    }
+
+    const locale: Locale = props.locale || i18n.locale
+    const parts: NumberFormatToPartsResult = i18n._ntp(props.value, locale, key, options)
+
+    const values = parts.map((part, index) => {
+      const slot: ?Function = data.scopedSlots && data.scopedSlots[part.type]
+      return slot ? slot({ [part.type]: part.value, index, parts }) : part.value
+    })
+
+    return h(props.tag, values)
+  }
+}
diff --git a/src/index.js b/src/index.js
@@ -9,26 +9,14 @@ import {
   isObject,
   looseClone,
   remove,
-  merge
+  merge,
+  numberFormatKeys
 } from './util'
 import BaseFormatter from './format'
 import I18nPath from './path'
 
 import type { PathValue } from './path'
 
-const numberFormatKeys = [
-  'style',
-  'currency',
-  'currencyDisplay',
-  'useGrouping',
-  'minimumIntegerDigits',
-  'minimumFractionDigits',
-  'maximumFractionDigits',
-  'minimumSignificantDigits',
-  'maximumSignificantDigits',
-  'localeMatcher',
-  'formatMatcher'
-]
 const linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g
 const linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/
 const bracketsMatcher = /[()]/g
@@ -626,14 +614,14 @@ export default class VueI18n {
     this._vm.$set(this._vm.numberFormats, locale, merge(this._vm.numberFormats[locale] || {}, format))
   }
 
-  _localizeNumber (
+  _getNumberFormatter (
     value: number,
     locale: Locale,
     fallback: Locale,
     numberFormats: NumberFormats,
     key: string,
     options: ?NumberFormatOptions
-  ): ?NumberFormatResult {
+  ): ?Object {
     let _locale: Locale = locale
     let formats: NumberFormat = numberFormats[_locale]
 
@@ -662,7 +650,7 @@ export default class VueI18n {
           formatter = this._numberFormatters[id] = new Intl.NumberFormat(_locale, format)
         }
       }
-      return formatter.format(value)
+      return formatter
     }
   }
 
@@ -680,8 +668,8 @@ export default class VueI18n {
       return nf.format(value)
     }
 
-    const ret: ?NumberFormatResult =
-      this._localizeNumber(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options)
+    const formatter: ?Object = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options)
+    const ret: ?NumberFormatResult = formatter && formatter.format(value)
     if (this._isFallbackRoot(ret)) {
       if (process.env.NODE_ENV !== 'production' && !this._silentTranslationWarn) {
         warn(`Fall back to number localization of root: key '${key}' .`)
@@ -729,6 +717,34 @@ export default class VueI18n {
 
     return this._n(value, locale, key, options)
   }
+
+  _ntp (value: number, locale: Locale, key: ?string, options: ?NumberFormatOptions): NumberFormatToPartsResult {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot format to parts a Number value due to not supported Intl.NumberFormat.')
+      }
+      return []
+    }
+
+    if (!key) {
+      const nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options)
+      return nf.formatToParts(value)
+    }
+
+    const formatter: ?Object = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options)
+    const ret: ?NumberFormatToPartsResult = formatter && formatter.formatToParts(value)
+    if (this._isFallbackRoot(ret)) {
+      if (process.env.NODE_ENV !== 'production' && !this._silentTranslationWarn) {
+        warn(`Fall back to format number to parts of root: key '${key}' .`)
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n._ntp(value, locale, key, options)
+    } else {
+      return ret || []
+    }
+  }
 }
 
 let availabilities: IntlAvailability

diff --git a/src/install.js b/src/install.js
@@ -1,7 +1,8 @@
 import { warn } from './util'
 import extend from './extend'
 import mixin from './mixin'
-import component from './component'
+import interpolationComponent from './components/interpolation'
+import numberComponent from './components/number'
 import { bind, update, unbind } from './directive'
 
 export let Vue
@@ -26,7 +27,8 @@ export function install (_Vue) {
   extend(Vue)
   Vue.mixin(mixin)
   Vue.directive('t', { bind, update, unbind })
-  Vue.component(component.name, component)
+  Vue.component(interpolationComponent.name, interpolationComponent)
+  Vue.component(numberComponent.name, numberComponent)
 
   // use simple mergeStrategies to prevent i18n instance lose '__proto__'
   const strats = Vue.config.optionMergeStrategies

diff --git a/src/path.js b/src/path.js
@@ -122,7 +122,6 @@ function getPathCharType (ch: ?string): string {
     case 0x2D: // -
       return 'ident'
 
-    case 0x20: // Space
     case 0x09: // Tab
     case 0x0A: // Newline
     case 0x0D: // Return

diff --git a/src/util.js b/src/util.js
@@ -1,5 +1,23 @@
 /* @flow */
 
+/**
+ * constants
+ */
+
+export const numberFormatKeys = [
+  'style',
+  'currency',
+  'currencyDisplay',
+  'useGrouping',
+  'minimumIntegerDigits',
+  'minimumFractionDigits',
+  'maximumFractionDigits',
+  'minimumSignificantDigits',
+  'maximumSignificantDigits',
+  'localeMatcher',
+  'formatMatcher'
+]
+
 /**
  * utilities
  */

diff --git a/test/e2e/test/number_formatting.js b/test/e2e/test/number_formatting.js
@@ -0,0 +1,11 @@
+module.exports = {
+  component: function (browser) {
+    browser
+      .url('http://localhost:8080/examples/number-formatting/')
+      .waitForElementVisible('#app', 1000)
+      .assert.containsText('p', 'お金: ￥1,000')
+      .click('select option[value=en-US]')
+      .assert.attributeContains('p', 'innerHTML', 'Money: $1,000<span style="vertical-align: super">00</span>')
+      .end()
+  }
+}
diff --git a/test/unit/basic.test.js b/test/unit/basic.test.js
@@ -105,6 +105,13 @@ describe('basic', () => {
         it('should be translated', () => {
           assert.strictEqual(i18n.t('message.format'), messages.en.message.format)
         })
+
+        it('should be translated if keypath contains spaces', () => {
+          assert.strictEqual(
+            i18n.t('message.Hello {0}', ['kazupon']),
+            'Hello kazupon'
+          )
+        })
       })
 
       describe('array keypath', () => {

diff --git a/test/unit/fixture/index.js b/test/unit/fixture/index.js
@@ -28,6 +28,7 @@ export default {
       circular2: 'Bar @:message.circular3',
       circular3: 'Buz @:message.circular1',
       linkTwice: '@:message.hello: @:message.hello',
+      'Hello {0}': 'Hello {0}',
       'hyphen-locale': 'hello hyphen',
       '1234': 'Number-based keys are found',
       '1mixedKey': 'Mixed keys are not found.',

diff --git a/test/unit/interpolation.test.js b/test/unit/interpolation.test.js
@@ -1,4 +1,4 @@
-import Component from '../../src/component'
+import Component from '../../src/components/interpolation'
 
 const messages = {
   en: {