Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uk (Ukrainian) locale month #899

Merged
merged 20 commits into from
May 22, 2020
Merged

Conversation

Valerika
Copy link
Contributor

Hi! Please, approve my pull request for uk (Ukrainian) locale. Thanks!

@codecov
Copy link

codecov bot commented May 11, 2020

Codecov Report

Merging #899 into dev will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##               dev      #899   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          166       167    +1     
  Lines         1388      1420   +32     
  Branches       295       301    +6     
=========================================
+ Hits          1388      1420   +32     
Impacted Files Coverage Δ
src/locale/uk.js 100.00% <100.00%> (ø)
src/locale/ru.js 100.00% <0.00%> (ø)
src/plugin/localeData/index.js 100.00% <0.00%> (ø)
src/plugin/customParseFormat/index.js 100.00% <0.00%> (ø)
src/locale/rw.js 100.00% <0.00%> (ø)

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 8035c8a...a6fdd51. Read the comment docs.

@Valerika Valerika changed the title Fix uk locale month Fix uk (Ukrainian) locale month May 12, 2020
@iamkun
Copy link
Owner

iamkun commented May 13, 2020

Please fix the unit test.

@Valerika
Copy link
Contributor Author

@iamkun done

import uk from '../../src/locale/uk'
import '../../src/locale/zh-cn'

dayjs.extend(customParseFormat)
dayjs.extend(localizedFormat)
dayjs.extend(localeData)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why adding this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry, just removed

src/locale/uk.js Outdated
const monthFormat = 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_')
const monthStandalone = 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')

const monthShortFormat = 'сiч_лют_бер_квiт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_')
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's no difference in monthShort, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, you're right

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not using the original monthsShort?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for the same logic with long names
(I looked Russian locale file)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no need actually.
You can just add monthFormat and monthStandalone

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@iamkun
Copy link
Owner

iamkun commented May 22, 2020

there's one lint error.

46:15 error Missing space before value for key 'monthsShort'

@iamkun iamkun merged commit a08756e into iamkun:dev May 22, 2020
@iamkun
Copy link
Owner

iamkun commented May 22, 2020

Thanks

@Valerika Valerika deleted the fix-uk-locale-month branch May 27, 2020 19:12
iamkun pushed a commit that referenced this pull request May 28, 2020
## [1.8.28](v1.8.27...v1.8.28) (2020-05-28)

### Bug Fixes

* Fix CustomParseFormat plugin month index error ([#918](#918)) ([fa2ec7f](fa2ec7f)), closes [#915](#915)
* Update Ukrainian (uk) locale monthFormat and monthStandalone ([#899](#899)) ([a08756e](a08756e))
@iamkun
Copy link
Owner

iamkun commented May 28, 2020

🎉 This PR is included in version 1.8.28 🎉

The release is available on:

Your semantic-release bot 📦🚀

andrewhood125ruhuc added a commit to andrewhood125ruhuc/SidRH2 that referenced this pull request May 10, 2022
## [1.8.28](iamkun/dayjs@v1.8.27...v1.8.28) (2020-05-28)

### Bug Fixes

* Fix CustomParseFormat plugin month index error ([#918](iamkun/dayjs#918)) ([fa2ec7f](iamkun/dayjs@fa2ec7f)), closes [#915](iamkun/dayjs#915)
* Update Ukrainian (uk) locale monthFormat and monthStandalone ([#899](iamkun/dayjs#899)) ([a08756e](iamkun/dayjs@a08756e))
andrewhood125ruhuc added a commit to andrewhood125ruhuc/SidRH2 that referenced this pull request May 10, 2022
## [1.8.28](iamkun/dayjs@v1.8.27...v1.8.28) (2020-05-28)

### Bug Fixes

* Fix CustomParseFormat plugin month index error ([#918](iamkun/dayjs#918)) ([fa2ec7f](iamkun/dayjs@fa2ec7f)), closes [#915](iamkun/dayjs#915)
* Update Ukrainian (uk) locale monthFormat and monthStandalone ([#899](iamkun/dayjs#899)) ([a08756e](iamkun/dayjs@a08756e))
splashwizard pushed a commit to splashwizard/tracking-time that referenced this pull request Oct 21, 2024
## [1.8.28](iamkun/dayjs@v1.8.27...v1.8.28) (2020-05-28)

### Bug Fixes

* Fix CustomParseFormat plugin month index error ([#918](iamkun/dayjs#918)) ([fa2ec7f](iamkun/dayjs@fa2ec7f)), closes [#915](iamkun/dayjs#915)
* Update Ukrainian (uk) locale monthFormat and monthStandalone ([#899](iamkun/dayjs#899)) ([a08756e](iamkun/dayjs@a08756e))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants