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.

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

Desktop: Fixes #9960: Creating a profile changes the language of Joplin #10038

Merged
merged 7 commits into from
Mar 5, 2024
Merged

Desktop: Fixes #9960: Creating a profile changes the language of Joplin #10038

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ec2fee
#9960 - locale change after creating new profile
cagnusmarlsen Mar 2, 2024
48c446f
Merge branch 'laurent22:dev' into locale-change-on-create-new-profile
cagnusmarlsen Mar 2, 2024
5527dd6
use single quotes
cagnusmarlsen Mar 2, 2024
bf9afd2
Merge branch 'locale-change-on-create-new-profile' of https://github.…
cagnusmarlsen Mar 2, 2024
90548a3
explain changes
cagnusmarlsen Mar 4, 2024
7b2a8e6
whitespaces removed
cagnusmarlsen Mar 4, 2024
3877887
whitespaces removed
cagnusmarlsen Mar 4, 2024
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
11 changes: 9 additions & 2 deletions packages/lib/BaseApplication.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,8 +747,15 @@ export default class BaseApplication {
}

if (Setting.value('firstStart')) {
const locale = shim.detectAndSetLocale(Setting);
reg.logger().info(`First start: detected locale as ${locale}`);

// detectAndSetLocale sets the locale to the system default locale.
// Not calling it when a new profile is created ensures that the
// the language set by the user is not overridden by the system
// default language.
if (!Setting.value('isSubProfile')) {
Copy link
Owner

Choose a reason for hiding this comment

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

Thank for this fix. Would you mind adding a short comment to explain why we have this check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not at all, I've added a comment to the code.

const locale = shim.detectAndSetLocale(Setting);
reg.logger().info(`First start: detected locale as ${locale}`);
}
Setting.skipDefaultMigrations();

if (Setting.value('env') === 'dev') {
Expand Down
Loading