Skip to content
This repository has been archived by the owner on Aug 13, 2023. It is now read-only.

Override moment formats #2114

Merged
merged 25 commits into from
Sep 16, 2019
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5a47dc6
Override moment formats
DenisHdz Sep 12, 2019
963f9a4
Merge conflicts
DenisHdz Sep 12, 2019
e78edfb
Use es5
DenisHdz Sep 12, 2019
76baa16
Merge branch 'latest' into override-moment-formats
DenisHdz Sep 12, 2019
e9bff01
Add russian test
DenisHdz Sep 13, 2019
f4860a9
Merge branch 'override-moment-formats' of github.com:bbc/psammead int…
DenisHdz Sep 13, 2019
c435fcb
Add Ukrainian test
DenisHdz Sep 13, 2019
1ec22b0
Add Brasil test
DenisHdz Sep 13, 2019
8e99895
Add Serbian test
DenisHdz Sep 13, 2019
9e7ae17
Add Serbian Cyrillic test
DenisHdz Sep 13, 2019
29a3a39
Bump minor version
DenisHdz Sep 13, 2019
4658773
Merge branch 'latest' into override-moment-formats
DenisHdz Sep 16, 2019
cb016b6
Fix conflicts
DenisHdz Sep 16, 2019
4e1d487
Merge branch 'override-moment-formats' of github.com:bbc/psammead int…
DenisHdz Sep 16, 2019
145d63b
Fix conflicts
DenisHdz Sep 16, 2019
41b80d7
Merge branch 'latest' of github.com:bbc/psammead into override-moment…
DenisHdz Sep 16, 2019
1deeaab
Replace sr text variant
DenisHdz Sep 16, 2019
c69eac1
Fix conflicts
DenisHdz Sep 16, 2019
878034e
Merge branch 'latest' of github.com:bbc/psammead into override-moment…
DenisHdz Sep 16, 2019
aef6564
Remove duplicated line in Navigation Changelog
DenisHdz Sep 16, 2019
7cc722d
Merge branch 'latest' into override-moment-formats
DenisHdz Sep 16, 2019
06121d0
Merge branch 'latest' into override-moment-formats
DenisHdz Sep 16, 2019
ccb7c77
Merge branch 'latest' of github.com:bbc/psammead into override-moment…
DenisHdz Sep 16, 2019
59bc819
Merge branch 'override-moment-formats' of github.com:bbc/psammead int…
DenisHdz Sep 16, 2019
6266cad
Leave duplicated Navigation changelog record
DenisHdz Sep 16, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/utilities/psammead-locales/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
| ------- | ----------- |
| 2.4.0 | [PR#2114](https://github.com/bbc/psammead/pull/2114) Add some overrides for Brasil, Russian, Serbian and Ukrainian |
| 2.3.0 | [PR#2080](https://github.com/bbc/psammead/pull/2080) Add an eslintrc config file to cater for IE11 compatibility issues |
| 2.2.7 | [PR#2094](https://github.com/bbc/psammead/pull/2094) Fix for Punjabi (`pa-in`) locale spelling of ago |
| 2.2.6 | [PR#1933](https://github.com/bbc/psammead/pull/1933) Stories now used fixed timestamp |
Expand Down
7 changes: 5 additions & 2 deletions packages/utilities/psammead-locales/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ The following locales have overrides to meet BBC World Service requirements wher

- `/moment/ar` - locale override for Arabic
- `/moment/fa` - locale override for Persian (Farsi)
- `/moment/pt-br` - locale override for Brasil
- `/moment/ru` - locale override for Russian
- `/moment/sr` - locale override for Serbian
- `/moment/sr-cyrl` - locale override for Serbian Cyrillic
- `/moment/uk` - locale override for Ukrainian
- `/moment/yo` - locale override for Yoruba

### Numerals

`/numerals` - Numerals in several different number systems, e.g. Bengali, Burmese, Eastern Arabic, Western Arabic. This can be used for localised numbers for components. Returns arrays of the format `['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'];`


## Installation

```jsx
Expand All @@ -46,7 +50,6 @@ moment.locale('ig');
import { Bengali } from '@bbc/psammead-locales/numerals';
```


## Contributing

Psammead is completely open source. We are grateful for any contributions, whether they be new components, bug fixes or general improvements. Please see our primary contributing guide which can be found at [the root of the Psammead respository](https://github.com/bbc/psammead/blob/latest/CONTRIBUTING.md).
Expand Down
14 changes: 12 additions & 2 deletions packages/utilities/psammead-locales/moment/index.stories.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,31 @@ import notes from '../README.md';
import './ar';
import './fa';
import './ig';
import './pa-in';
import './pcm';
import './ps';
import './pt-br';
import './ru';
import './sr';
import './sr-cyrl';
import './uk';
import './yo';
import './pa-in';

const stories = storiesOf('Utilities|Psammead Locales', module);

const locales = [
{ name: 'Arabic', locale: 'ar' },
{ name: 'Brasil', locale: 'pt-br' },
{ name: 'Igbo', locale: 'ig' },
{ name: 'Pashto', locale: 'ps' },
{ name: 'Persian', locale: 'fa' },
{ name: 'Pidgin', locale: 'pcm' },
{ name: 'Yoruba', locale: 'yo' },
{ name: 'Punjabi', locale: 'pa-in' },
{ name: 'Russian', locale: 'ru' },
{ name: 'Serbian', locale: 'sr' },
{ name: 'Serbian Cyrillic', locale: 'sr-cyrl' },
{ name: 'Ukrainian', locale: 'uk' },
{ name: 'Yoruba', locale: 'yo' },
];

// Fixed timestamp for 27 August 2019, 14:54 BST
Expand Down
10 changes: 10 additions & 0 deletions packages/utilities/psammead-locales/moment/pt-br.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
var moment = require('moment');
require('moment/locale/pt-br');

moment.updateLocale('pt-br', {
longDateFormat: {
LL: 'D MMMM YYYY',
LLL: 'D MMMM YYYY [às] HH:mm',
LLLL: 'dddd, D MMMM YYYY [às] HH:mm',
},
});
Loading