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

merge cp-lji branch to develop #36

Merged
merged 90 commits into from
Dec 16, 2021
Merged

Conversation

petrjasek
Copy link
Member

No description provided.

petrjasek and others added 15 commits March 26, 2020 18:26
* Missing french translations

* Missing translations

* More translations

* Remove comma
* TBC Planning Items were shown in wrong order when Feature/Top story filter was ON (superdesk#1022)

* [SDAN-668] (fix): Attribute error when accessing app.settings (superdesk#1026)

* Allow date format override depending on language (superdesk#1033)

* Allow date format override depending on language

* Provide default value (for tests)

* lint

* Remove unused old variables

Co-authored-by: vikas <nrvikas@gmail.com>
Co-authored-by: MarkLark86 <mark.pittaway@gmail.com>
* Format dates with locale format

* Convertion is not needed

* lint

* Fix tests
Co-authored-by: Tolga Akin <akint@aap.com.au>
@petrjasek petrjasek requested a review from MarkLark86 December 15, 2021 14:24
@petrjasek
Copy link
Member Author

@MarkLark86 I will go over it but if you could also scan it for any nonsense that would be great

*
* 'en' comes by default
*/
import 'moment/locale/fr-ca';
Copy link
Contributor

Choose a reason for hiding this comment

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

This would need to be improved at some point, to use configured languages

@petrjasek petrjasek added this to the v2.1 milestone Dec 16, 2021
@@ -1,11 +1,7 @@
{{ item.slugline }}
{{ item.headline }}
{{ item.source }}
Copy link
Contributor

Choose a reason for hiding this comment

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

This changes the default format of text downloads. Might need this modification in the customer's theme folder instead

@MarkLark86
Copy link
Contributor

@petrjasek I went over the changes. Not sure if I caught everything, but it mostly looked fine

@petrjasek petrjasek merged commit 6d36243 into superdesk:develop Dec 16, 2021
@petrjasek petrjasek deleted the cp-lji branch June 9, 2023 07:28
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.

5 participants