Skip to content

Use user locale as default in the template - #11134

Merged
nickvergessen merged 6 commits into
masterfrom
locale-template-fix
Sep 19, 2018
Merged

Use user locale as default in the template#11134
nickvergessen merged 6 commits into
masterfrom
locale-template-fix

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Sep 10, 2018

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added this to the Nextcloud 14.0.1 milestone Sep 10, 2018
@skjnldsvskjnldsv self-assigned this Sep 10, 2018
@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 10, 2018
nickvergessen
nickvergessen previously requested changes Sep 10, 2018
View reviewed changes
Comment threadlib/private/TemplateLayout.php Outdated
@skjnldsv
Use user locale as default in the template
df143cb
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 10, 2018
@skjnldsv
Fix public l10n
081dcc5
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Since requirement
01f2fef
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nickvergessen
nickvergessen reviewed Sep 10, 2018
View reviewed changes
Comment threadlib/private/L10N/Factory.php Outdated
@skjnldsv
Typehint
7d158c6
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv

skjnldsv commented Sep 10, 2018

Copy link
Copy Markdown
MemberAuthor

Failure unrelated sh: 1: kill: No such process

nickvergessen
nickvergessen reviewed Sep 13, 2018
View reviewed changes
Comment threadlib/private/TemplateLayout.php
@skjnldsv

skjnldsv commented Sep 13, 2018

Copy link
Copy Markdown
MemberAuthor

@nickvergessen fixed

nickvergessen
nickvergessen reviewed Sep 13, 2018
View reviewed changes
Comment threadlib/private/TemplateLayout.php Outdated
@skjnldsv
Fallback to $lang if no $locale match
92fbb6d
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nickvergessen
nickvergessen reviewed Sep 19, 2018
View reviewed changes
Comment threadlib/public/L10N/IFactory.php Outdated
schiessle
schiessle approved these changes Sep 19, 2018
View reviewed changes

@schiessleschiessle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks good, beside what @nickvergessen mentioned

@skjnldsv
Fix since tag
1e9ab0a
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 19, 2018
@nickvergessen

nickvergessen commented Sep 19, 2018

Copy link
Copy Markdown
Member

And now quickly backport it, so it is in 14.0.1

@nickvergessen
nickvergessen merged commit b026b5d into masterSep 19, 2018
@nickvergessen
nickvergessen deleted the locale-template-fix branch September 19, 2018 14:06
@skjnldsvskjnldsv mentioned this pull request Sep 19, 2018
Merged
@kesselbkesselb mentioned this pull request Sep 23, 2018
Merged
@skjnldsvskjnldsv mentioned this pull request Oct 19, 2018
Merged
@kesselbkesselb mentioned this pull request Oct 25, 2019
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen approved these changes
@schiessleschiessleschiessle approved these changes
@georgehrkegeorgehrkeAwaiting requested review from georgehrke
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@danxuliudanxuliuAwaiting requested review from danxuliu

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 15

Development

Successfully merging this pull request may close these issues.

3 participants

@skjnldsv@nickvergessen@schiessle