diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
| commit | eee36267d627ae08898d2b3301f56ce729055e82 (patch) | |
| tree | dae581a9867b8dcdd2c3ab0154794a1ff10ad98e /app/helpers | |
| parent | 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960 (diff) | |
| parent | ac9fb0d654440ce1179bab4071941450aa994d2c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/languages_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index 4077e19bd..e5bae2c6b 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -97,7 +97,7 @@ module LanguagesHelper lg: ['Ganda', 'Luganda'].freeze, li: ['Limburgish', 'Limburgs'].freeze, ln: ['Lingala', 'Lingála'].freeze, - lo: ['Lao', 'ພາສາ'].freeze, + lo: ['Lao', 'ລາວ'].freeze, lt: ['Lithuanian', 'lietuvių kalba'].freeze, lu: ['Luba-Katanga', 'Tshiluba'].freeze, lv: ['Latvian', 'latviešu valoda'].freeze, |