diff options
| author | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
| commit | c0341f06be5310a00b85a5d48fa80891d47c6710 (patch) | |
| tree | 907ef7f787f8bd446a6d9be1448a8bcff74e5a08 /app/lib/admin | |
| parent | 169688aa9f2a69ac3d36332c833e9cad43b5f7a5 (diff) | |
| parent | 6f78c66fe01921a4e7e01aa6e2386a5fce7f3afd (diff) | |
Merge remote-tracking branch 'glitch/main'
Not at all sure where the admin UI is going to display English language names now but OK.
Diffstat (limited to 'app/lib/admin')
| -rw-r--r-- | app/lib/admin/metrics/dimension/languages_dimension.rb | 2 | ||||
| -rw-r--r-- | app/lib/admin/metrics/dimension/tag_languages_dimension.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/admin/metrics/dimension/languages_dimension.rb b/app/lib/admin/metrics/dimension/languages_dimension.rb index a6aaf5d21..1cc5f4120 100644 --- a/app/lib/admin/metrics/dimension/languages_dimension.rb +++ b/app/lib/admin/metrics/dimension/languages_dimension.rb @@ -20,6 +20,6 @@ class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension: rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, @limit]]) - rows.map { |row| { key: row['locale'], human_key: human_locale(row['locale']), value: row['value'].to_s } } + rows.map { |row| { key: row['locale'], human_key: standard_locale_name(row['locale']), value: row['value'].to_s } } end end diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb index 1cfa07478..afbc8cde8 100644 --- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb +++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb @@ -25,7 +25,7 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]]) - rows.map { |row| { key: row['language'], human_key: human_locale(row['language']), value: row['value'].to_s } } + rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } } end private |