Skip to content

Fix parsing of language code #21760

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.

Sign up for GitHub

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

Jump to bottom
Merged
rullzer merged 2 commits into from
Jul 9, 2020
Merged

Fix parsing of language code #21760

rullzer merged 2 commits into from
Jul 9, 2020

Conversation

@kesselb
Copy link
Contributor

@kesselb kesselb commented Jul 8, 2020 •
edited
Loading

Fix #20453

image

server/core/src/OC/l10n.js

Lines 333 to 338 in 677d4bf

/**
* Returns the user's language
*
* @returns {String} language string
*/
export const getLanguage = () => $('html').prop('lang')

OC.getLanguage() uses the html property lang.

server/lib/private/TemplateLayout.php

Lines 158 to 159 in cbd2086

$lang = str_replace('_', '-', $lang);
$this->assign('language', $lang);

server/core/templates/layout.base.php

Line 2 in 72b8083

<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" >

@kesselb
Copy link
Contributor Author

kesselb commented Jul 8, 2020

/compile /

@kesselb kesselb requested review from rullzer and skjnldsv July 8, 2020 18:19
@kesselb kesselb added 3. to review Waiting for reviews bug labels Jul 8, 2020
@kesselb kesselb force-pushed the fix/20453/get-plural branch from d3167e4 to 69b061a Compare July 8, 2020 18:45
rullzer
rullzer approved these changes Jul 9, 2020
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

🙈

MorrisJobke
MorrisJobke approved these changes Jul 9, 2020
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Nice finding 👍

@MorrisJobke
Copy link
Member

MorrisJobke commented Jul 9, 2020

Webpack CI job fails

@rullzer
Copy link
Member

rullzer commented Jul 9, 2020

/compile amend /

@MorrisJobke MorrisJobke added this to the Nextcloud 20 milestone Jul 9, 2020
@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 9, 2020
@MorrisJobke
Copy link
Member

MorrisJobke commented Jul 9, 2020

Amend failed :/

juliusknorr
juliusknorr approved these changes Jul 9, 2020
View reviewed changes
Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Works, was also the case for formal german

@kesselb kesselb force-pushed the fix/20453/get-plural branch from 6216670 to 2bb61e8 Compare July 9, 2020 11:51
@kesselb
Copy link
Contributor Author

kesselb commented Jul 9, 2020

Amend failed :/

Rebased and recompiled.

@rullzer
Copy link
Member

rullzer commented Jul 9, 2020

and rebase :S

@kesselb
Copy link
Contributor Author

kesselb commented Jul 9, 2020

and rebase :S

Not again :)

@kesselb
Fix parsing of language code
5ba9825 
Signed-off-by: Daniel Kesselberg <[email protected]>
@kesselb kesselb force-pushed the fix/20453/get-plural branch from 2bb61e8 to 5ba9825 Compare July 9, 2020 19:11
@kesselb
Compile assets
1967148 
Signed-off-by: Daniel Kesselberg <[email protected]>
@rullzer rullzer merged commit e18e451 into master Jul 9, 2020
@rullzer rullzer deleted the fix/20453/get-plural branch July 9, 2020 20:09
@juliusknorr
Copy link
Member

juliusknorr commented Jul 16, 2020

/backport 5ba9825 to stable19

@juliusknorr
Copy link
Member

juliusknorr commented Jul 16, 2020

/backport 5ba9825 to stable18

@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Jul 16, 2020

The backport to stable18 failed. Please do this backport manually.

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jul 16, 2020
Merged
@juliusknorr juliusknorr mentioned this pull request Jul 23, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzer rullzer rullzer approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Milestone

Nextcloud 20

Development

Successfully merging this pull request may close these issues.

Plural translations don't seem to work

6 participants

@kesselb @MorrisJobke @rullzer @juliusknorr @ChristophWurst