Add user locale/region setting #5623

tcitworld · 2017-07-05T16:29:54Z

This PR allows having a dedicated user locale/region setting. See #1781

Needs :

Where to put the list of locales (obviously this locales.json is going to be moved)
More tests (please point out where)
UI fixes on personal settings page
Provide a system wide setting for locale
Add a check on OCS endpoint for valid locale format
Pass locale to MomentJS
Don't reload the page, just pass the locale to momentJS.

mention-bot · 2017-07-05T16:29:56Z

@tcitworld, thanks for your PR! By analyzing the history of the files in this pull request, we identified @nickvergessen, @rullzer and @LukasReschke to be potential reviewers.

nickvergessen · 2017-07-06T06:39:10Z

lib/private/Settings/Personal/PersonalInfo.php

+			return $userLocaleString === $value['code'];
+		});
+
+		if (count($userLocale) > 0)


nickvergessen · 2017-07-06T06:41:06Z

settings/templates/settings/personal/personal.info.php

@@ -314,3 +315,29 @@
 	</a>
 </form>
 <?php } ?>
+
+<form id="locale" class="section">


Move above the closing bracket? You don't need the dropdown when you can't save it.

nickvergessen · 2017-07-06T06:41:11Z

settings/templates/settings/personal/personal.info.php

+			</option>
+		<?php endforeach;?>
+	</select>
+</form>


nickvergessen · 2017-07-06T06:42:13Z

lib/private/L10N/Factory.php

@@ -111,7 +112,7 @@ public function get($app, $lang = null) {

 		if (!isset($this->instances[$lang][$app])) {
 			$this->instances[$lang][$app] = new L10N(
-				$this, $app, $lang,
+				$this, $app, $lang, $locale,


locale is not filled with the users config?!

nickvergessen · 2017-07-06T06:46:48Z

Migrate the core apps to use this

I disagree. This should happen automatically. It should automatically pick up the user's config and use that localle if none was given explicit, just like with the language. The cases where we set the language explicit are a different story of course, but there shouldn't be a lot.

codecov · 2017-07-07T09:18:19Z

Codecov Report

Merging #5623 into master will increase coverage by 20.26%.
The diff coverage is 46.84%.

@@              Coverage Diff              @@
##             master    #5623       +/-   ##
=============================================
+ Coverage     31.71%   51.98%   +20.26%     
- Complexity    26010    26037       +27     
=============================================
  Files          1661     1661               
  Lines         96137    96230       +93     
  Branches       1290     1290               
=============================================
+ Hits          30494    50026    +19532     
+ Misses        65643    46204    -19439

Impacted Files	Coverage Δ	Complexity Δ
core/templates/layout.user.php	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
config/config.sample.php	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...ings/templates/settings/personal/personal.info.php	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
lib/private/Settings/Personal/PersonalInfo.php	`0% <0%> (ø)`	`21 <5> (+5)`	⬆️
lib/private/TemplateLayout.php	`0% <0%> (ø)`	`49 <0> (ø)`	⬇️
apps/provisioning_api/lib/Controller/AUserData.php	`60.75% <100%> (+0.5%)`	`15 <0> (ø)`	⬇️
core/js/js.js	`65.38% <50%> (-0.15%)`	`0 <0> (ø)`
...rovisioning_api/lib/Controller/UsersController.php	`71.49% <55.55%> (-0.35%)`	`139 <0> (+4)`
lib/private/L10N/L10N.php	`81.96% <71.42%> (-4%)`	`6 <3> (+1)`
lib/private/L10N/Factory.php	`65.53% <87.5%> (+4.11%)`	`109 <26> (+20)`	⬆️
... and 390 more

georgehrke · 2017-07-08T09:55:36Z

Migrate the core apps to use this

Ideally core apps would just use momentJS and we set moment.locale($locale) in core.js

tcitworld · 2017-07-17T08:12:01Z

Ideally core apps would just use momentJS and we set moment.locale($locale) in core.js

Done.

georgehrke · 2017-07-17T13:41:45Z

There is too much space between Language and Locale:

Additionally I would like to show some examples for the selected locale.

georgehrke · 2017-07-17T13:44:22Z

AFAIK you can simply update the locale with moment.locale(newLocale). There is no need to do a full reload.

georgehrke · 2017-07-17T13:48:56Z

How did you acquire the data for lib/private/L10N/locales.json?

Is there an automated way to update it?

MorrisJobke · 2017-08-01T11:30:52Z

@tcitworld Could you please resolve the conflict? Thanks 👍

tcitworld · 2017-08-01T12:06:42Z

There is too much space between Language and Locale:

Yeah, don't really know why.

Additionally I would like to show some examples for the selected locale.

Meaning ?

How did you acquire the data for lib/private/L10N/locales.json?

Originally stolen from https://gist.github.com/jacobbubu/1836273, but I've found newer versions at https://gist.github.com/jasef/337431c43c3addb2cbd5eb215b376179 and https://gist.github.com/ndbroadbent/588fefab8e0f1b459fcec8181b41b39c

I guess it could be retrieved from elsewhere (for instance Debian has a languages code list at cat /usr/share/i18n/SUPPORTED), but I didn't found any perfect up-to-date list.

Could you please resolve the conflict? Thanks

Fixed.

Fixed a while ago.

georgehrke · 2017-08-01T12:08:20Z

Meaning ?

I thought about something like this:

doodhout · 2017-09-17T18:54:41Z

Any progress on this?

Currently biding my time using en_GB as a language+locale setting, but having the option to choose both would be nice.

georgehrke · 2017-10-28T13:53:35Z

@tcitworld What's the current state? :)
Do you need any help?

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

georgehrke · 2018-06-28T08:48:09Z

It's done from a coding point of view imho. Just the layouting fixes :)

MorrisJobke · 2018-06-28T15:00:42Z

lib/public/IL10N.php

+	 * * The code (en_US, fr_CA, ...) of the locale that is used for this IL10N object
+	 *
+	 * @return string locale
+	 * @since 13.0.0


MorrisJobke · 2018-06-28T15:00:50Z

lib/public/L10N/IFactory.php

+	/**
+	 * @param string|null $lang user language as default locale
+	 * @return string locale If nothing works it returns 'en_US'
+	 * @since 13.0.0


MorrisJobke · 2018-06-28T15:01:02Z

lib/public/L10N/IFactory.php

+	 *
+	 * @param string $string
+	 * @return string Unique function name
+	 * @since 9.0.0


And this especially ;)

MorrisJobke

Tested and works 👍 (beside the little nitpicks the code looks good as well)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

georgehrke · 2018-06-28T15:38:10Z

Fixed the docblock since mistakes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

melroy89 · 2018-12-19T00:47:44Z

Does this also introduces a way for an admin to set the DEFAULT locale/region? Let's say you create a new user.

EDIT: I see, this is not an GUI option set. I think the only way is to set defaults within the config file. Correct?

melroy89 · 2018-12-19T00:53:30Z

Ps. Also update the docs? https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/language_configuration.html?highlight=language#

with the new default_locale and force_locale?...

tcitworld · 2018-12-19T08:50:07Z

@Danger89

I see, this is not an GUI option set. I think the only way is to set defaults within the config file. Correct?

Yup, just like for the language.

skjnldsv · 2018-12-19T08:53:06Z

@tcitworld can you provide a pr for the docs ? :)

See nextcloud/server#5623

tcitworld · 2018-12-19T09:56:46Z

@skjnldsv nextcloud/documentation#1051

See nextcloud/server#5623

tcitworld added the 2. developing Work in progress label Jul 5, 2017

tcitworld added this to the Nextcloud 13 milestone Jul 5, 2017

tcitworld requested review from nickvergessen and blizzz July 5, 2017 16:29

tcitworld added the feature: settings label Jul 5, 2017

tcitworld requested a review from georgehrke July 5, 2017 16:31

nickvergessen reviewed Jul 6, 2017

View reviewed changes

nickvergessen previously requested changes Jul 6, 2017

View reviewed changes

georgehrke requested a review from jancborchardt July 17, 2017 13:41

georgehrke mentioned this pull request Jul 20, 2017

Add setting option »Show weekend« nextcloud/calendar#536

Closed

raimund-schluessler mentioned this pull request Jul 22, 2017

[Feature Request] Display date according to locale nextcloud/tasks#45

Closed

tcitworld force-pushed the locale-setting branch from a79e02d to 286ac1d Compare August 1, 2017 11:58

tcitworld mentioned this pull request Aug 1, 2017

Dedicated locale/region option #1781

Closed

tcitworld mentioned this pull request Sep 5, 2017

Let user decide their timezone nextcloud/calendar#586

Closed

georgehrke assigned georgehrke and tcitworld Oct 28, 2017

georgehrke added 4 commits June 27, 2018 21:52

cache available locales to minimize fs access

b3921c6

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

properly handle force_locale setting

9157086

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

fix use of findLocale

b17d256

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

move locales file to /resources/

8c73b13

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

georgehrke force-pushed the locale-setting branch from fbeac9c to 8c73b13 Compare June 27, 2018 19:52

georgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 27, 2018

MorrisJobke reviewed Jun 28, 2018

View reviewed changes

MorrisJobke approved these changes Jun 28, 2018

View reviewed changes

Design fixes

325403a

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

skjnldsv approved these changes Jun 28, 2018

View reviewed changes

docblock version fixes

4c1e581

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Update PHPDoc

c1682f4

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

MorrisJobke merged commit 61842f6 into master Jun 29, 2018

MorrisJobke deleted the locale-setting branch June 29, 2018 06:03

juliusknorr mentioned this pull request Dec 7, 2018

Add optional locale parameter to \OCP\L10N\IFactory #12916

Merged

skjnldsv added the pending documentation This pull request needs an associated documentation update label Dec 19, 2018

tcitworld added a commit to nextcloud/documentation that referenced this pull request Dec 19, 2018

Add documentation for the locale setting

f96dd19

See nextcloud/server#5623

tcitworld mentioned this pull request Dec 19, 2018

Add documentation for the locale setting nextcloud/documentation#1051

Merged

skjnldsv removed the pending documentation This pull request needs an associated documentation update label Dec 19, 2018

backportbot-nextcloud bot pushed a commit to nextcloud/documentation that referenced this pull request Dec 20, 2018

Add documentation for the locale setting

1be5dce

See nextcloud/server#5623

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add user locale/region setting #5623

Add user locale/region setting #5623

tcitworld commented Jul 5, 2017 •

edited by skjnldsv

Loading

mention-bot commented Jul 5, 2017

nickvergessen Jul 6, 2017

nickvergessen Jul 6, 2017

nickvergessen Jul 6, 2017

nickvergessen Jul 6, 2017

nickvergessen commented Jul 6, 2017

codecov bot commented Jul 7, 2017 •

edited

Loading

georgehrke commented Jul 8, 2017

tcitworld commented Jul 17, 2017

georgehrke commented Jul 17, 2017 •

edited

Loading

georgehrke commented Jul 17, 2017

georgehrke commented Jul 17, 2017

MorrisJobke commented Aug 1, 2017

tcitworld commented Aug 1, 2017

georgehrke commented Aug 1, 2017

doodhout commented Sep 17, 2017

georgehrke commented Oct 28, 2017

georgehrke commented Jun 28, 2018

MorrisJobke Jun 28, 2018

MorrisJobke Jun 28, 2018

MorrisJobke Jun 28, 2018

MorrisJobke left a comment

georgehrke commented Jun 28, 2018

melroy89 commented Dec 19, 2018 •

edited

Loading

melroy89 commented Dec 19, 2018 •

edited

Loading

tcitworld commented Dec 19, 2018

skjnldsv commented Dec 19, 2018

tcitworld commented Dec 19, 2018

Add user locale/region setting #5623

Add user locale/region setting #5623

Conversation

tcitworld commented Jul 5, 2017 • edited by skjnldsv Loading

mention-bot commented Jul 5, 2017

nickvergessen Jul 6, 2017

Choose a reason for hiding this comment

nickvergessen Jul 6, 2017

Choose a reason for hiding this comment

nickvergessen Jul 6, 2017

Choose a reason for hiding this comment

nickvergessen Jul 6, 2017

Choose a reason for hiding this comment

nickvergessen commented Jul 6, 2017

codecov bot commented Jul 7, 2017 • edited Loading

Codecov Report

georgehrke commented Jul 8, 2017

tcitworld commented Jul 17, 2017

georgehrke commented Jul 17, 2017 • edited Loading

georgehrke commented Jul 17, 2017

georgehrke commented Jul 17, 2017

MorrisJobke commented Aug 1, 2017

tcitworld commented Aug 1, 2017

georgehrke commented Aug 1, 2017

doodhout commented Sep 17, 2017

georgehrke commented Oct 28, 2017

georgehrke commented Jun 28, 2018

MorrisJobke Jun 28, 2018

Choose a reason for hiding this comment

MorrisJobke Jun 28, 2018

Choose a reason for hiding this comment

MorrisJobke Jun 28, 2018

Choose a reason for hiding this comment

MorrisJobke left a comment

Choose a reason for hiding this comment

georgehrke commented Jun 28, 2018

melroy89 commented Dec 19, 2018 • edited Loading

melroy89 commented Dec 19, 2018 • edited Loading

tcitworld commented Dec 19, 2018

skjnldsv commented Dec 19, 2018

tcitworld commented Dec 19, 2018

tcitworld commented Jul 5, 2017 •

edited by skjnldsv

Loading

codecov bot commented Jul 7, 2017 •

edited

Loading

georgehrke commented Jul 17, 2017 •

edited

Loading

melroy89 commented Dec 19, 2018 •

edited

Loading

melroy89 commented Dec 19, 2018 •

edited

Loading