Skip to content

Commit

Permalink
fix: always use included locale file to prevent mismatches (closes #52)
Browse files Browse the repository at this point in the history
  • Loading branch information
oddlama committed Sep 28, 2022
1 parent c56f176 commit 3e18167
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ you can use the installer to chroot into an existing system. Run `./install --he
If you encounter this problem, you might be able to fix the problem by switching to testing by dropping to a shell temporarily:

```
# Press S<Enter> when ased about what to do next.
# Press S<Enter> when asked about what to do next.
# This opens an emergency shell in the chroot.
echo 'ACCEPT_KEYWORDS="~amd64"' >> /etc/portage/make.conf # Enable testing for your architecture.
emerge -v gentoo-kernel-bin # Update kernel to newest version
Expand Down
10 changes: 1 addition & 9 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,6 @@ function get_all_timezones() {
readarray -t ALL_TIMEZONES < <(find /usr/share/zoneinfo -type f -printf "%P\n" | sort -u)
}

function get_supported_locales() {
if [[ -e /usr/share/i18n/SUPPORTED ]]; then
echo /usr/share/i18n/SUPPORTED
else
echo "$GENTOO_INSTALL_REPO_DIR/contrib/i18n_supported"
fi
}

function recalculate_locales() {
LOCALES=""
N_LOCALES=0
Expand Down Expand Up @@ -329,7 +321,7 @@ function create_btrfs_centric_layout() {

get_all_keymaps
get_all_timezones
readarray -t SUPPORTED_LOCALES < "$(get_supported_locales)"
readarray -t SUPPORTED_LOCALES < "$GENTOO_INSTALL_REPO_DIR/contrib/i18n_supported"
readarray -t LOCALE_A < <(locale -a)


Expand Down
2 changes: 1 addition & 1 deletion contrib/i18n_supported
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
C.UTF-8 UTF-8
aa_DJ.UTF-8 UTF-8
aa_DJ ISO-8859-1
aa_ER UTF-8
Expand Down Expand Up @@ -77,6 +76,7 @@ brx_IN UTF-8
bs_BA.UTF-8 UTF-8
bs_BA ISO-8859-2
byn_ER UTF-8
C.UTF-8 UTF-8
ca_AD.UTF-8 UTF-8
ca_AD ISO-8859-15
ca_ES.UTF-8 UTF-8
Expand Down

0 comments on commit 3e18167

Please sign in to comment.