lib/active_scaffold/locale/hu.yml @@ -14,4 +14,4 @@ ActiveRecord::Base.class_eval {include ActiveRecordPermissions::Permissions} require 'bridges/bridge.rb' -I18n.load_path << File.dirname(__FILE__) + '/lib/active_scaffold/locale/en.rb' +I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'lib', 'active_scaffold', 'locale', '*.{rb,yml}')] environment.rb @@ -81,8 +81,9 @@ module ActiveScaffold::Config # a generally-applicable name for this ActiveScaffold ... will be used for generating page/section headers attr_writer :label - def label - as_(@label) || model.human_name + def label(options={}) + options[:count] ||= model.count + as_(@label) || model.human_name(options) end ## lib/active_scaffold/config/core.rb @@ -30,7 +30,7 @@ module ActiveScaffold::Config # ---------------------------- # the label= method already exists in the Form base class def label - @label ? as_(@label) : as_(:create_model, :model => @core.label.singularize) + @label ? as_(@label) : as_(:create_model, :model => @core.label(:count => 1)) end # whether the form stays open after a create or not lib/active_scaffold/config/create.rb @@ -23,7 +23,7 @@ module ActiveScaffold::Config # the label for this action. used for the header. attr_writer :label def label - @label ? as_(@label) : as_(:show_model, :model => @core.label.singularize) + @label ? as_(@label) : as_(:show_model, :model => @core.label(:count => 1)) end # provides access to the list of columns specifically meant for this action to use lib/active_scaffold/config/show.rb @@ -22,7 +22,7 @@ module ActiveScaffold::Config # the label= method already exists in the Form base class def label - @label ? as_(@label) : as_(:update_model, :model => @core.label.singularize) + @label ? as_(@label) : as_(:update_model, :model => @core.label(:count => 1)) end attr_accessor :nested_links lib/active_scaffold/config/update.rb @@ -77,7 +77,7 @@ module ActiveScaffold def active_scaffold_input_plural_association(column, options) associated_options = @record.send(column.association.name).collect {|r| [r.to_label, r.id]} select_options = associated_options | options_for_association(column.association) - return 'no options' if select_options.empty? + return as_(:no_options) if select_options.empty? html = "<ul class=\"checkbox-list\" id=\"#{options[:id]}\">" lib/active_scaffold/helpers/form_column_helpers.rb @@ -58,7 +58,7 @@ module ActiveScaffold def active_scaffold_search_multi_select(column, options) associated_options = @record.send(column.association.name).collect {|r| [r.to_label, r.id]} select_options = associated_options | options_for_association(column.association, true) - return 'no options' if select_options.empty? + return as_(:no_options) if select_options.empty? html = "<ul class=\"checkbox-list\" id=\"#{options[:id]}\">" lib/active_scaffold/helpers/search_column_helpers.rb @@ -28,6 +28,7 @@ :loading => 'Loading…', :next => 'Next', :no_entries => 'No Entries', + :no_options => 'no options', :omit_header => 'Omit Header', :options => 'Options', :pdf => 'PDF', lib/active_scaffold/locale/en.rb 4d8c651f352be31484114a45b189e7d18ff5199d Laszlo Bacsi lackac@lackac.hu http://github.com/activescaffold/active_scaffold/commit/773cbbfe07e8582255539d2397c0c206d8fbe4af 773cbbfe07e8582255539d2397c0c206d8fbe4af 2009-03-30T00:49:52-07:00 2009-03-26T02:00:24-07:00 Using I18n for singularizing, localized 'no options', added Hungarian localization f60be840719ffc6681341dea4e8e0eb11bc85033 Sergio sergio@entrecables.com