diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb index f644257b..66a7504b 100644 --- a/app/helpers/categories_helper.rb +++ b/app/helpers/categories_helper.rb @@ -1,6 +1,6 @@ module CategoriesHelper def all_categories - @all_categories ||= Category.all.sort_by { |a| a.name.downcase } + @all_categories ||= Category.all.sort_by { |a| a.display_name.downcase } end def categories_for_select diff --git a/app/models/category.rb b/app/models/category.rb index 16b4e606..ebb39cc4 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -3,7 +3,16 @@ class Category < ApplicationRecord translates :name + def display_name + return name if name.present? + + fallback_locale, fallback_name = name_translations&.find { |_, v| v.present? } + return "#{fallback_name} [#{fallback_locale}]" if fallback_name.present? + + self.class.model_name.human + end + def to_s - name + display_name end end diff --git a/app/views/shared/_post_filters.html.erb b/app/views/shared/_post_filters.html.erb index d471cb0c..fa87f9de 100644 --- a/app/views/shared/_post_filters.html.erb +++ b/app/views/shared/_post_filters.html.erb @@ -19,7 +19,7 @@