Merge pull request #768 from iamkun/dev

D2M
iamkun · Jan 6, 2020 · 2cc9d8f · 2cc9d8f
2 parents 6b587da + 3f080f7
commit 2cc9d8f
Show file tree

Hide file tree

Showing 34 changed files with 500 additions and 49 deletions.
diff --git a/docs/en/API-reference.md b/docs/en/API-reference.md
@@ -514,3 +514,9 @@ plugin [`MinMax`](./Plugin.md#minmax)
 `.calendar` to display calendar time
 
 plugin [`Calendar`](./Plugin.md#calendar)
+
+### UpdateLocale
+
+`.updateLocale` to update a locale's properties
+
+plugin [`UpdateLocale`](./Plugin.md#updateLocale)
diff --git a/docs/en/I18n.md b/docs/en/I18n.md
@@ -77,7 +77,9 @@ dayjs()
 
 ## Customize
 
-You could create your own locale.
+You could update locale config via plugin [`UpdateLocale`](./Plugin.md#updateLocale)
+
+You could also create your own locale.
 
 Feel free to open a pull request to share your locale.
 

diff --git a/docs/en/Plugin.md b/docs/en/Plugin.md
@@ -442,6 +442,19 @@ dayjs().calendar(null, {
 })
 ```
 
+### UpdateLocale
+
+- UpdateLocale adds `.updateLocale` API to update a locale's properties.
+
+```javascript
+import updateLocale from 'dayjs/plugin/updateLocale'
+dayjs.extend(updateLocale)
+
+dayjs.updateLocale('en', {
+  months : String[]
+})
+```
+
 ## Customize
 
 You could build your own Day.js plugin to meet different needs.

diff --git a/docs/es-es/API-reference.md b/docs/es-es/API-reference.md
@@ -514,3 +514,9 @@ plugin [`MinMax`](./Plugin.md#minmax)
 `.calendar` to display calendar time
 
 plugin [`Calendar`](./Plugin.md#calendar)
+
+### UpdateLocale
+
+`.updateLocale` to update a locale's properties
+
+plugin [`UpdateLocale`](./Plugin.md#updateLocale)
diff --git a/docs/es-es/I18n.md b/docs/es-es/I18n.md
@@ -81,7 +81,9 @@ dayjs()
 
 ## Personalización
 
-You could create your own locale.
+You could update locale config via plugin [`UpdateLocale`](./Plugin.md#updateLocale)
+
+You could also create your own locale.
 
 Feel free to open a pull request to share your locale.
 

diff --git a/docs/es-es/Plugin.md b/docs/es-es/Plugin.md
@@ -438,6 +438,19 @@ dayjs().calendar(null, {
 })
 ```
 
+### UpdateLocale
+
+- UpdateLocale adds `.updateLocale` API to update a locale's properties.
+
+```javascript
+import updateLocale from 'dayjs/plugin/updateLocale'
+dayjs.extend(updateLocale)
+
+dayjs.updateLocale('en', {
+  months : String[]
+})
+```
+
 ## Personalización
 
 Puedes construir tu propio complemento de Day.js para cubrir tus necesidades.

diff --git a/docs/ja/API-reference.md b/docs/ja/API-reference.md
@@ -514,3 +514,9 @@ UTC でパースや表示をしたい場合は、[`UTC`](./Plugin.md#utc)プラ
 `.calendar`で与えた日付のカレンダー上の情報が得られます。
 
 プラグイン [`Calendar`](./Plugin.md#calendar)
+
+### UpdateLocale
+
+`.updateLocale` to update a locale's properties
+
+plugin [`UpdateLocale`](./Plugin.md#updateLocale)
diff --git a/docs/ja/I18n.md b/docs/ja/I18n.md
@@ -77,6 +77,8 @@ dayjs()
 
 ## カスタマイズ
 
+You could update locale config via plugin [`UpdateLocale`](./Plugin.md#updateLocale)
+
 独自のロケールを作成することもできます。
 
 あなたのプラグインを共有する pull request を是非送ってみてください。

diff --git a/docs/ja/Plugin.md b/docs/ja/Plugin.md
@@ -447,6 +447,19 @@ dayjs().calendar(null, {
 })
 ```
 
+### UpdateLocale
+
+- UpdateLocale adds `.updateLocale` API to update a locale's properties.
+
+```javascript
+import updateLocale from 'dayjs/plugin/updateLocale'
+dayjs.extend(updateLocale)
+
+dayjs.updateLocale('en', {
+  months : String[]
+})
+```
+
 ## カスタマイズ
 
 さまざまなニーズに合わせて独自の Day.js プラグインを構築することができます。

diff --git a/docs/ko/API-reference.md b/docs/ko/API-reference.md
@@ -513,3 +513,9 @@ plugin [`MinMax`](./Plugin.md#minmax)
 `.calendar` to display calendar time
 
 plugin [`Calendar`](./Plugin.md#calendar)
+
+### UpdateLocale
+
+`.updateLocale` to update a locale's properties
+
+plugin [`UpdateLocale`](./Plugin.md#updateLocale)
diff --git a/docs/ko/I18n.md b/docs/ko/I18n.md
@@ -77,6 +77,8 @@ dayjs()
 
 ## Customize
 
+You could update locale config via plugin [`UpdateLocale`](./Plugin.md#updateLocale)
+
 당신만의 locale을 만들 수 있습니다.
 
 locale을 공휴하기위해 풀 리퀘스트를 여십시오.

diff --git a/docs/ko/Plugin.md b/docs/ko/Plugin.md
@@ -439,6 +439,19 @@ dayjs().calendar(null, {
 })
 ```
 
+### UpdateLocale
+
+- UpdateLocale adds `.updateLocale` API to update a locale's properties.
+
+```javascript
+import updateLocale from 'dayjs/plugin/updateLocale'
+dayjs.extend(updateLocale)
+
+dayjs.updateLocale('en', {
+  months : String[]
+})
+```
+
 ## Customize
 
 다양한 요구를 충족하기위해 자신만의 Day.js 플러그인을 만들 수 있습니다.

diff --git a/docs/pt-br/API-reference.md b/docs/pt-br/API-reference.md
@@ -512,3 +512,9 @@ plugin [`MinMax`](./Plugin.md#minmax)
 `.calendar` to display calendar time
 
 plugin [`Calendar`](./Plugin.md#calendar)
+
+### UpdateLocale
+
+`.updateLocale` to update a locale's properties
+
+plugin [`UpdateLocale`](./Plugin.md#updateLocale)
diff --git a/docs/pt-br/I18n.md b/docs/pt-br/I18n.md
@@ -77,6 +77,8 @@ dayjs()
 
 ## Customizar
 
+You could update locale config via plugin [`UpdateLocale`](./Plugin.md#updateLocale)
+
 Você pode criar o seu próprio _locale_.
 
 Sinta-se a vontade para abrir uma pull request e compartilhar sua _locale_.

diff --git a/docs/pt-br/Plugin.md b/docs/pt-br/Plugin.md
@@ -438,6 +438,19 @@ dayjs().calendar(null, {
 })
 ```
 
+### UpdateLocale
+
+- UpdateLocale adds `.updateLocale` API to update a locale's properties.
+
+```javascript
+import updateLocale from 'dayjs/plugin/updateLocale'
+dayjs.extend(updateLocale)
+
+dayjs.updateLocale('en', {
+  months : String[]
+})
+```
+
 ## Customizar
 
 Você também pode construir seu próprio plugin Day.js para diferentes necessidades.

diff --git a/docs/zh-cn/API-reference.md b/docs/zh-cn/API-reference.md
@@ -564,3 +564,9 @@ plugin [`MinMax`](./Plugin.md#minmax)
 `.calendar` 来显示日历时间
 
 plugin [`Calendar`](./Plugin.md#calendar)
+
+### 更新语言配置
+
+`.updateLocale` 来更新语言配置的属性
+
+plugin [`UpdateLocale`](./Plugin.md#updateLocale)
diff --git a/docs/zh-cn/I18n.md b/docs/zh-cn/I18n.md
@@ -77,7 +77,9 @@ dayjs()
 
 ## 自定义
 
-你可以根据需要自由的编写一个 Day.js 语言配置
+你可以使用 [`UpdateLocale`](./Plugin.md#updateLocale) 插件来更新语言配置
+
+你还可以根据需要自由的编写一个 Day.js 语言配置
 
 同时欢迎提交 PR 与大家分享你的语言配置
 
@@ -93,6 +95,20 @@ const localeObject = {
   months: 'Enero_Febrero ... '.split('_'), // 月份 Array
   monthsShort: 'Jan_F'.split('_'), // 可选, 短的月份 Array, 如果没提供则使用前三个字符
   ordinal: n => `${n}º`, // 序号生成工厂函数 Function (number) => return number + output
+  formats: {
+    // 时间日期格式 - 长
+    LTS: 'h:mm:ss A',
+    LT: 'h:mm A',
+    L: 'MM/DD/YYYY',
+    LL: 'MMMM D, YYYY',
+    LLL: 'MMMM D, YYYY h:mm A',
+    LLLL: 'dddd, MMMM D, YYYY h:mm A',
+    // 时间日期格式 - 短
+    l: 'D/M/YYYY',
+    ll: 'D MMM, YYYY',
+    lll: 'D MMM, YYYY h:mm A',
+    llll: 'ddd, MMM D, YYYY h:mm A'
+  },
   relativeTime: {
     // 相对时间, %s %d 不用翻译
     future: 'in %s', // e.g. in 2 hours, %s been replaced with 2hours

diff --git a/docs/zh-cn/Plugin.md b/docs/zh-cn/Plugin.md
@@ -441,6 +441,19 @@ dayjs().calendar(null, {
 })
 ```
 
+### UpdateLocale
+
+- UpdateLocale 增加了 `.updateLocale` API 来更新语言配置的属性。
+
+```javascript
+import updateLocale from 'dayjs/plugin/updateLocale'
+dayjs.extend(updateLocale)
+
+dayjs.updateLocale('en', {
+  months : String[]
+})
+```
+
 ## 自定义
 
 你可以根据需要自由的编写一个 Day.js 插件

diff --git a/src/locale/cs.js b/src/locale/cs.js
@@ -1,5 +1,52 @@
 import dayjs from 'dayjs'
 
+function plural(n) {
+  return (n > 1) && (n < 5) && (~~(n / 10) !== 1) // eslint-disable-line
+}
+/* eslint-disable */ 
+function translate(number, withoutSuffix, key, isFuture) {
+  const result = `${number} `
+  switch (key) {
+    case 's': // a few seconds / in a few seconds / a few seconds ago
+      return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami'
+    case 'm': // a minute / in a minute / a minute ago
+      return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou')
+    case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'minuty' : 'minut')
+      }
+      return `${result}minutami`
+    case 'h': // an hour / in an hour / an hour ago
+      return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou')
+    case 'hh': // 9 hours / in 9 hours / 9 hours ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'hodiny' : 'hodin')
+      }
+      return `${result}hodinami`
+    case 'd': // a day / in a day / a day ago
+      return (withoutSuffix || isFuture) ? 'den' : 'dnem'
+    case 'dd': // 9 days / in 9 days / 9 days ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'dny' : 'dní')
+      }
+      return `${result}dny`
+    case 'M': // a month / in a month / a month ago
+      return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem'
+    case 'MM': // 9 months / in 9 months / 9 months ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'měsíce' : 'měsíců')
+      }
+      return `${result}měsíci`
+    case 'y': // a year / in a year / a year ago
+      return (withoutSuffix || isFuture) ? 'rok' : 'rokem'
+    case 'yy': // 9 years / in 9 years / 9 years ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'roky' : 'let')
+      }
+      return `${result}lety`
+  }
+}
+/* eslint-enable */
 const locale = {
   name: 'cs',
   weekdays: 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
@@ -21,17 +68,17 @@ const locale = {
   relativeTime: {
     future: 'za %s',
     past: 'před %s',
-    s: 'několik sekund',
-    m: 'minuta',
-    mm: '%d minut',
-    h: 'hodina',
-    hh: '%d hodin',
-    d: 'den',
-    dd: '%d dnů',
-    M: 'měsíc',
-    MM: '%d měsíců',
-    y: 'rok',
-    yy: '%d roků'
+    s: translate,
+    m: translate,
+    mm: translate,
+    h: translate,
+    hh: translate,
+    d: translate,
+    dd: translate,
+    M: translate,
+    MM: translate,
+    y: translate,
+    yy: translate
   }
 }
 

diff --git a/src/locale/ru.js b/src/locale/ru.js
@@ -7,6 +7,26 @@ const monthShortFormat = 'янв._февр._мар._апр._мая_июня_ию
 const monthShortStandalone = 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
 
 const MONTHS_IN_FORMAT = /D[oD]?(\[[^[\]]*\]|\s)+MMMM?/
+
+function plural(word, num) {
+  const forms = word.split('_')
+  return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]) // eslint-disable-line
+}
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+  const format = {
+    mm: withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+    hh: 'час_часа_часов',
+    dd: 'день_дня_дней',
+    MM: 'месяц_месяца_месяцев',
+    yy: 'год_года_лет'
+  }
+  if (key === 'm') {
+    return withoutSuffix ? 'минута' : 'минуту'
+  }
+
+  return `${number} ${plural(format[key], +number)}`
+}
+
 const locale = {
   name: 'ru',
   weekdays: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
@@ -37,16 +57,16 @@ const locale = {
     future: 'через %s',
     past: '%s назад',
     s: 'несколько секунд',
-    m: 'минута',
-    mm: '%d минут',
+    m: relativeTimeWithPlural,
+    mm: relativeTimeWithPlural,
     h: 'час',
-    hh: '%d часов',
+    hh: relativeTimeWithPlural,
     d: 'день',
-    dd: '%d дней',
+    dd: relativeTimeWithPlural,
     M: 'месяц',
-    MM: '%d месяцев',
+    MM: relativeTimeWithPlural,
     y: 'год',
-    yy: '%d лет'
+    yy: relativeTimeWithPlural
   },
   ordinal: n => n
 }