Skip to content

Add language choice for installation #664

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

Closed
CodeShakingSheep wants to merge 11 commits into from
Closed

Add language choice for installation #664

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a5785e
Update manifest.toml
CodeShakingSheep Feb 9, 2024
80207df
Update install
CodeShakingSheep Feb 9, 2024
29d2aaf
Update upgrade
CodeShakingSheep Feb 9, 2024
ca5453e
Update install
CodeShakingSheep Feb 9, 2024
a193e33
Update manifest.toml
CodeShakingSheep Feb 9, 2024
800fe77
Update upgrade
CodeShakingSheep Feb 9, 2024
c1aaaf3
Update upgrade
CodeShakingSheep Feb 13, 2024
da63516
Update upgrade
CodeShakingSheep Feb 13, 2024
131e1e3
Update upgrade
CodeShakingSheep Feb 19, 2024
f72c772
Update upgrade
CodeShakingSheep Feb 21, 2024
4dc15d2
Merge branch 'testing' into add-language-choice
CodeShakingSheep May 3, 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
7 changes: 7 additions & 0 deletions manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ ram.runtime = "512M"
type = "group"
default = "visitors"

[install.language]
ask.en = "Choose the application language"
ask.fr = "Choisissez la langue de l'application"
type = "select"
choices = ["en_US", "es_ES", "it_IT", "fr_FR", "de_DE"]
default = "en_US"

[install.user_home]
ask.en = "Access the users home folder from Nextcloud?"
ask.fr = "Accéder au dossier personnel des utilisateurs depuis Nextcloud ?"
Expand Down
11 changes: 11 additions & 0 deletions scripts/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ ynh_script_progression --message="Configuring $app..." --weight=8
# Set the mysql.utf8mb4 config to true in config.php
exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"

# Set default language in config.php
raw_language=$(echo "$language" | awk -F'_' '{print $1}')
exec_occ config:system:set default_language --value="$raw_language"
Copy link
Copy Markdown
Member

@Salamandar Salamandar Feb 19, 2024

Choose a reason for hiding this comment

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

shouldn't it be just $language here ?

Copy link
Copy Markdown
Member Author

@CodeShakingSheep CodeShakingSheep Feb 19, 2024

Choose a reason for hiding this comment

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

Nope, Nextcloud's default_language uses ISO_639-1 language codes such as en for English, see https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#default-language

That's why we need to cut the first part from $language, e.g. take en from en_US.


# Set default locale in config.php
exec_occ config:system:set default_locale --value="$language"

# Set default phone region in config.php
country=$(echo "$language" | awk -F'_' '{print $2}')
exec_occ config:system:set default_phone_region --value="$country"

# Ensure that UpdateNotification app is disabled
exec_occ app:disable updatenotification

Expand Down
11 changes: 11 additions & 0 deletions scripts/upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,17 @@ then
exec_occ maintenance:repair
fi

# Fix warning "Your installation has no default phone region set"
if [ "$(exec_occ config:system:get default_phone_region)" == "" ]; then
config_locale=$(exec_occ config:system:get default_locale)
if [ "$config_locale" == "" ]; then
# If it's not set in config use "US" as default
config_locale="US"
Copy link
Copy Markdown
Member

@ericgaspar ericgaspar Feb 13, 2024

Choose a reason for hiding this comment

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

Why not FR by default?

Copy link
Copy Markdown
Member

@DeMiro5001 DeMiro5001 Feb 14, 2024

Choose a reason for hiding this comment

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

Why not any other code. It would be more logical that the user chooses from a drop down list at the installation or change it in the app panel

Copy link
Copy Markdown
Member

@ericgaspar ericgaspar Feb 14, 2024

Choose a reason for hiding this comment

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

We are talking about a default value set if there was no previous value set.

Copy link
Copy Markdown
Member Author

@CodeShakingSheep CodeShakingSheep Feb 19, 2024

Choose a reason for hiding this comment

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

Hi @ericgaspar,
I set "US" because in manifest.toml I used "en_US" as default install language and so I wanted to use the default country here as well.

Copy link
Copy Markdown
Member

@ericgaspar ericgaspar Feb 19, 2024

Choose a reason for hiding this comment

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

let's then change the default language to fr (because it is by far the most used...)

fi
country=$(echo "$config_locale" | awk -F'_' '{print $2}')
exec_occ config:system:set default_phone_region --value="$country"
fi

# Upgrade may fail if this app is enabled
# Take all apps enabled, and check if mail is one of them
# Then temporary disable the mail app
Expand Down