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

[locale] Fix #4568: Insert punjabi for "next" in nextWeek format #4583

Merged
merged 1 commit into from
Apr 29, 2018

Conversation

ashsearle
Copy link
Contributor

@ashsearle ashsearle commented Apr 21, 2018

Fixes #4568

@coveralls
Copy link

coveralls commented Apr 21, 2018

Coverage Status

Coverage decreased (-0.3%) to 94.362% when pulling 7c58eed on ashsearle:fix/4568 into aba77ec on moment:develop.

@marwahaha
Copy link
Member

@harpreetkhalsagtbit thoughts ?

@marwahaha marwahaha merged commit 3062ca1 into moment:develop Apr 29, 2018
marwahaha pushed a commit that referenced this pull request Jan 22, 2019
* Fix "the the" typo in test (#4578)

* [locale] Fix #4568: Insert punjabi for "next" (#4583)

* Fix type of WeekSpec

You can set `dow` without setting `doy`, so the type should reflect that
GmaMontero added a commit to despegar/moment that referenced this pull request Sep 4, 2019
* [misc] release process fixes (moment#4961)

* Fix locale abbreviation in comment

* Update package-lock.json

* [misc] Fix type of WeekSpec (moment#4634)

* Fix "the the" typo in test (moment#4578)

* [locale] Fix moment#4568: Insert punjabi for "next" (moment#4583)

* Fix type of WeekSpec

You can set `dow` without setting `doy`, so the type should reflect that

* [new locale] (oc-lnc) Occitan (moment#4957)

* Add oc-lnc files

* Fix calendar test

* Fix the rest of tests

* Add locale author

* Dont make changes to package-lock

* Add newline at end of file

* [bugfix] Fix moment#4962 updateLocale with null to reset (moment#4966)

* [locale] es: Add es translation for invalidDate (moment#4560)

* Add es translation for invalidDate

* Fix lint

* [locale] improve mk translation (moment#4958)

* Update mk.js

* Update mk.js

* Update mk.js

* Update mk.js

* [locale] improve mk translation

* [tests] Fix various text typos (moment#4976)

* [locale] mr (Marathi) (moment#4990)

* tests according to changes in mr.js

* [locale] mr (Marathi)

We Marathi people follow standards mentioned below, to label timespans.

Label | Time Span 
------------ | -------------
पहाटे (post midnight, pre-sunrise) |    >= 12am to < 6am 
सकाळी (post sunrise, pre-noon) |    >= 6am to < 12pm
दुपारी (afternoon) |    >= 12pm to < 5pm
सायंकाळी (evening) |    >= 5pm to < 8pm
रात्री (night) |    >= 8pm to < 12am

Actually, 12am is confusing in Marathi tradition. In modern clock system, Moment 12am is considered in arriving date as 0am. And in Marathi tradition it is referred to as final moment of the previous date (Sort of, 0:01 is starting minute of the arriving date) . To comply with modern clock system, I propose to refer to 0am as पहाटे , so that it is considered as moment in the arriving date. Hope this discription itself is not confusing :)

Another point is about range of पहाटे, ie. >= 0am to < 6am. Though conventionally, upto 2 am, we refer to the time as रात्री or पहाटे, both alternatively, I want to specifically call पहाटे for early times in the arriving date and रात्री for late times in the departing date, to make it more specific and well-defined, avoiding confusion about date of the time.

* [locale] correct translation of locale for Vietnam (moment#4874)

* correct translation of locale for Vietnam

* correct translation of locale for Vietnam (edit proper src files)

* Update author comment line

* [locale] (en-sg) Rename locale en-SG to en-sg (moment#5025)

* [locale] typos in Irish locale for months (moment#5127)

Fixed some typos in the Irish locale regarding months.

* [locale] (br) Breton move from 12-hour to 24-hour notation (moment#4975)

* Breton : move from 12-hour to 24-hour notation moment#4974 moment#4974

* Replace [e] by :

* [locale] bn: Improve translation as per Bangla Academy (moment#5055)

* Delete unused locales

* Remove unused locales

* Update test and build

* Add untracked locale
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants