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

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

Merged
merged 6 commits into from
Jan 23, 2019
Merged

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

merged 6 commits into from
Jan 23, 2019

Conversation

marwahaha
Copy link
Member

@Quenty31 can you review this? I made some changes because the test and source files did not match.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.06%) to 88.163% when pulling 2333807 on Quenty31:occitan into bb484bc on moment:develop.

@Quenty31
Copy link

Looks okay to me :) Many thanks for the time you took to review this!

@marwahaha marwahaha merged commit e3d82a8 into moment:develop Jan 23, 2019
@marwahaha marwahaha deleted the occitan branch January 23, 2019 00:41
@Quenty31
Copy link

Hello @marwahaha ! When will this be shipped to a new version of moment? :)

@marwahaha
Copy link
Member Author

Hi @Quenty31 , unfortunately I'm busy this week. But I can try to get to it next week.

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
@Mejans
Copy link

Mejans commented Apr 15, 2020

@marwahaha Hello! Any news about the integration of this locale?

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

Successfully merging this pull request may close these issues.

None yet

4 participants