Add locales for relativeTime and formats from momentjs by aadityataparia · Pull Request #560 · iamkun/dayjs

aadityataparia · 2019-04-05T07:32:07Z

Inspired from #541

This PR imports `relativeTime` and `formats` from momentjs locales.

I have skipped the ones that uses function like https://github.com/moment/moment/blob/d0f0dd8f40be987593767a3dc5e27c45c6a3fa49/locale/he.js#L45-L50 to keep it simple

             hh : function (number) {
                if (number === 2) {
                    return 'שעתיים';
                }
                return number + ' שעות';
            }

I have also made locale tests independent, so that it tests all locales even when one of them fails, let me know if I need to revert that.

Locales with missing keys

[ 
  'ar-ly',
  'be',
  'br',
  'bs',
  'cv',
  'de-ch',
  'gl',
  'gom-latn',
  'is',
  'it-ch',
  'lb',
  'lv',
  'me',
  'mn',
  'mr',
  'sl',
  'tlh',
  'tzl'
]

codecov-io · 2019-04-05T07:42:42Z

Codecov Report

Merging #560 into dev will not change coverage.
The diff coverage is 100%.

@@         Coverage Diff         @@
##            dev   #560   +/-   ##
===================================
  Coverage   100%   100%           
===================================
  Files       153    153           
  Lines       957    957           
  Branches    127    127           
===================================
  Hits        957    957

Impacted Files	Coverage Δ
src/locale/et.js	`100% <ø> (ø)`	⬆️
src/locale/he.js	`100% <ø> (ø)`	⬆️
src/locale/zh-tw.js	`100% <ø> (ø)`	⬆️
src/locale/zh-cn.js	`100% <ø> (ø)`	⬆️
src/locale/fa.js	`100% <ø> (ø)`	⬆️
src/locale/de.js	`100% <ø> (ø)`	⬆️
src/locale/sv.js	`100% <ø> (ø)`	⬆️
src/locale/it.js	`100% <ø> (ø)`	⬆️
src/locale/lt.js	`100% <ø> (ø)`	⬆️
src/locale/ro.js	`100% <ø> (ø)`	⬆️
... and 117 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 566873a...fd226f0. Read the comment docs.

ghost · 2019-04-05T07:54:55Z

Looks great!
I just don't know how to do this. Can you share your script to me, please?

aadityataparia · 2019-04-05T07:59:27Z

@xxyuk Sure: https://gist.github.com/aadityataparia/2972c69ae5a11bbbbe1f07bd69847a86

Also Tests are failing for:

Using ar locale to check for fallback
Locales which don't have all relativeTime keys (because they were functions)

iamkun · 2019-04-05T08:11:27Z

Perfect ~

aadityataparia · 2019-04-05T08:14:23Z

@iamkun Does relativeTimePlugin supports functions? if yes maybe we can import simple functions.

iamkun · 2019-04-05T08:19:55Z

@aadityataparia Not yet. But we could do this.

aadityataparia · 2019-04-05T08:37:38Z

@iamkun For now, should I remove relativeTime for locales which have function values?

iamkun · 2019-04-05T08:39:10Z

@iamkun For now, should I remove relativeTime for locales which have function values?

Yes, please. Still, we could add these later.

aadityataparia · 2019-04-05T09:53:55Z

@iamkun Done, all tests are passing now.

iamkun · 2019-04-05T10:16:39Z

 # build
-/locale
+/locale*
+/moment*


what's this used for?

Ah, sorry! Removing

aadityataparia · 2019-04-05T10:18:45Z

  const actualDate = dayjs(date)
  const expectedDate = moment(date)
  // todo: ar here isn't a good fix here
+  const arOldFormats = ar.formats


Also, @iamkun Any alternatives?

Never mind, I'll deal with this later.

aadityataparia · 2019-04-08T08:12:11Z

@iamkun any timeline on when this will be merged? 🤔

iamkun · 2019-04-08T08:22:38Z

next release 😬

ghost · 2019-04-26T06:04:45Z

const fs = require('fs')
const path = require('path')

const momentLocaleFolder = path.join(__dirname, 'locale')
const dayjsLocaleFolder = path.join(__dirname, 'src/locale')
const saveFolder = path.join(__dirname, 'src/locale')
const Moment = require(path.join(__dirname, './moment'))

function objectToString(obj, prefix = '  ') {
  let string = '{'
  Object.keys(obj).forEach((p, i) => {
    const str = JSON.stringify(obj[p])
    if (str) string += `\n${prefix}${p}: ${str}${i < Object.keys(obj).length - 1 ? ',' : ''}`
  })
  string += '\n},'
  return string
}

fs.readdirSync(momentLocaleFolder).forEach((file) => {
  const filePath = path.join(momentLocaleFolder, file)
  require(filePath)
  const momentLocaleRelativeTime = Moment[file.replace('.js', '')].relativeTime
  const momentLocaleFormats = Moment[file.replace('.js', '')].longDateFormat
  delete momentLocaleRelativeTime.ss

  const dayjsFilePath = path.join(dayjsLocaleFolder, file)
  const dayjsFile = fs.readFileSync(dayjsFilePath, 'utf-8')
  const oldLocale = dayjsFile.split('const locale = ')[1].split('dayjs.locale')[0]

  let toBeAdded = ''
  if (oldLocale.indexOf('formats') < 0) {
    toBeAdded += `formats: ${objectToString(momentLocaleFormats)}\n  `
  }

  if (oldLocale.indexOf('relativeTime') < 0) {
    toBeAdded += `relativeTime: ${objectToString(momentLocaleRelativeTime)}\n  `
  }

  const start = oldLocale.substring(0, oldLocale.lastIndexOf('}'))
  const end = oldLocale.substring(oldLocale.lastIndexOf('}'), oldLocale.length)
  const localeToWrite = `${start}${toBeAdded ? ',' : ''}${toBeAdded}${end}`

  const saveLocalePath = path.join(saveFolder, file)
  fs.writeFileSync(saveLocalePath, `import dayjs from 'dayjs'
const locale = ${localeToWrite}dayjs.locale(locale, null, true)
export default locale
`)
})

// Copy momentjs locales folder to `locale` folder in dayjs root
// Create dummy `moment.js` with contents
// module.exports = {
//  defineLocale(name, val) {
//    this[name] = val
//  }
// }
// Change `saveFolder` if you want to test before overwriting original files in dayjs

aadityataparia 's solution looks great 😀

## [1.8.13](v1.8.12...v1.8.13) (2019-04-26) ### Bug Fixes * Add missing relativeTime and formats for some locales ([#560](#560)) ([96b917e](96b917e)) * Add weekday (locale aware day of the week) plugin ([#569](#569)) ([9007cc5](9007cc5)), closes [#559](#559) * Allow customizing "am" / "pm" strings with locale meridiem function ([#580](#580)) ([576e93e](576e93e)), closes [#578](#578) * Fix `.add` day/week decimal rouding bug ([800f6c9](800f6c9)) * Fix `.diff` type definition error ([#565](#565)) ([c4921ae](c4921ae)), closes [#561](#561) * Fix CustomParseFormat plugin bug ([#568](#568)) ([1f5a9db](1f5a9db)), closes [#555](#555) * Fix relativeTime plugin Math.round bug ([40bea40](40bea40)) * skip square brackets in buddhistEra, advancedFormat plugins ([#556](#556)) ([9279718](9279718)), closes [#554](#554) * Update Indonesian locale([#574](#574)) ([0aa7143](0aa7143)) * Update locale month to support both array and function ([#581](#581)) ([b6599d3](b6599d3)) * Update LocalizedFormat plugin lowercase formats logic ([#557](#557)) ([d409304](d409304))

iamkun · 2019-04-26T15:19:00Z

🎉 This PR is included in version 1.8.13 🎉

The release is available on:

Your semantic-release bot 📦🚀

## [1.8.13](iamkun/dayjs@v1.8.12...v1.8.13) (2019-04-26) ### Bug Fixes * Add missing relativeTime and formats for some locales ([#560](iamkun/dayjs#560)) ([96b917e](iamkun/dayjs@96b917e)) * Add weekday (locale aware day of the week) plugin ([#569](iamkun/dayjs#569)) ([9007cc5](iamkun/dayjs@9007cc5)), closes [#559](iamkun/dayjs#559) * Allow customizing "am" / "pm" strings with locale meridiem function ([#580](iamkun/dayjs#580)) ([576e93e](iamkun/dayjs@576e93e)), closes [#578](iamkun/dayjs#578) * Fix `.add` day/week decimal rouding bug ([800f6c9](iamkun/dayjs@800f6c9)) * Fix `.diff` type definition error ([#565](iamkun/dayjs#565)) ([c4921ae](iamkun/dayjs@c4921ae)), closes [#561](iamkun/dayjs#561) * Fix CustomParseFormat plugin bug ([#568](iamkun/dayjs#568)) ([1f5a9db](iamkun/dayjs@1f5a9db)), closes [#555](iamkun/dayjs#555) * Fix relativeTime plugin Math.round bug ([40bea40](iamkun/dayjs@40bea40)) * skip square brackets in buddhistEra, advancedFormat plugins ([#556](iamkun/dayjs#556)) ([9279718](iamkun/dayjs@9279718)), closes [#554](iamkun/dayjs#554) * Update Indonesian locale([#574](iamkun/dayjs#574)) ([0aa7143](iamkun/dayjs@0aa7143)) * Update locale month to support both array and function ([#581](iamkun/dayjs#581)) ([b6599d3](iamkun/dayjs@b6599d3)) * Update LocalizedFormat plugin lowercase formats logic ([#557](iamkun/dayjs#557)) ([d409304](iamkun/dayjs@d409304))

## [1.8.13](iamkun/dayjs@v1.8.12...v1.8.13) (2019-04-26) ### Bug Fixes * Add missing relativeTime and formats for some locales ([#560](iamkun/dayjs#560)) ([96b917e](iamkun/dayjs@96b917e)) * Add weekday (locale aware day of the week) plugin ([#569](iamkun/dayjs#569)) ([9007cc5](iamkun/dayjs@9007cc5)), closes [#559](iamkun/dayjs#559) * Allow customizing "am" / "pm" strings with locale meridiem function ([#580](iamkun/dayjs#580)) ([576e93e](iamkun/dayjs@576e93e)), closes [#578](iamkun/dayjs#578) * Fix `.add` day/week decimal rouding bug ([800f6c9](iamkun/dayjs@800f6c9)) * Fix `.diff` type definition error ([#565](iamkun/dayjs#565)) ([c4921ae](iamkun/dayjs@c4921ae)), closes [#561](iamkun/dayjs#561) * Fix CustomParseFormat plugin bug ([#568](iamkun/dayjs#568)) ([1f5a9db](iamkun/dayjs@1f5a9db)), closes [#555](iamkun/dayjs#555) * Fix relativeTime plugin Math.round bug ([40bea40](iamkun/dayjs@40bea40)) * skip square brackets in buddhistEra, advancedFormat plugins ([#556](iamkun/dayjs#556)) ([9279718](iamkun/dayjs@9279718)), closes [#554](iamkun/dayjs#554) * Update Indonesian locale([#574](iamkun/dayjs#574)) ([0aa7143](iamkun/dayjs@0aa7143)) * Update locale month to support both array and function ([#581](iamkun/dayjs#581)) ([b6599d3](iamkun/dayjs@b6599d3)) * Update LocalizedFormat plugin lowercase formats logic ([#557](iamkun/dayjs#557)) ([d409304](iamkun/dayjs@d409304))

aadityataparia force-pushed the aadi/relativeLocale branch from dd65877 to 929b065 Compare April 5, 2019 07:42

aadityataparia added 2 commits April 5, 2019 17:42

Make tests for each locale independent

1311be7

Add locales for relativeTime and Formats from momentjs

c23b6be

aadityataparia force-pushed the aadi/relativeLocale branch from 3e277d9 to c23b6be Compare April 5, 2019 08:44

Mock locale formats before checking for em fallback

978f197

aadityataparia force-pushed the aadi/relativeLocale branch from 2627c12 to fc65da5 Compare April 5, 2019 09:24

iamkun reviewed Apr 5, 2019

View reviewed changes

Add missing LTS format in x-pseudo locale

fd226f0

aadityataparia force-pushed the aadi/relativeLocale branch from fc65da5 to fd226f0 Compare April 5, 2019 10:17

aadityataparia commented Apr 5, 2019

View reviewed changes

iamkun merged commit 96b917e into iamkun:dev Apr 26, 2019

aadityataparia deleted the aadi/relativeLocale branch April 26, 2019 04:09

iamkun added the released label Apr 26, 2019

Uh oh!

Conversation

aadityataparia commented Apr 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

This PR imports relativeTime and formats from momentjs locales.

I have also made locale tests independent, so that it tests all locales even when one of them fails, let me know if I need to revert that.

Locales with missing keys

Uh oh!

codecov-io commented Apr 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ghost commented Apr 5, 2019

Uh oh!

aadityataparia commented Apr 5, 2019

Uh oh!

iamkun commented Apr 5, 2019

Uh oh!

aadityataparia commented Apr 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iamkun commented Apr 5, 2019

Uh oh!

aadityataparia commented Apr 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iamkun commented Apr 5, 2019

Uh oh!

aadityataparia commented Apr 5, 2019

Uh oh!

iamkun Apr 5, 2019

Choose a reason for hiding this comment

Uh oh!

aadityataparia Apr 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aadityataparia Apr 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iamkun Apr 5, 2019

Choose a reason for hiding this comment

Uh oh!

aadityataparia commented Apr 8, 2019

Uh oh!

iamkun commented Apr 8, 2019

Uh oh!

ghost commented Apr 26, 2019

Uh oh!

iamkun commented Apr 26, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

aadityataparia commented Apr 5, 2019 •

edited

Loading

This PR imports `relativeTime` and `formats` from momentjs locales.

codecov-io commented Apr 5, 2019 •

edited

Loading

aadityataparia commented Apr 5, 2019 •

edited

Loading

aadityataparia commented Apr 5, 2019 •

edited

Loading

aadityataparia Apr 5, 2019 •

edited

Loading

aadityataparia Apr 5, 2019 •

edited

Loading