active_scaffold 3.2.5 → 3.2.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.2.6
+- fix ordering with DISTINCT call
+- allow to override some human condition strings in i18n, and translate select values for non-association columns
+
 = 3.2.5
 - add outer window for pagination links
 - workaround rails 3.2.3 bug in TimeWithZone#to_time

data/config/locales/de.yml

@@ -27,6 +27,7 @@ de:
     export: 'Exportieren'
     nested_for_model: '%{nested_model} für %{parent_model}'
     nested_of_model: '%{nested_model} von %{parent_model}'
+    'false': 'False'
     filtered: '(Gefiltert)'
     found: 'Gefunden'
     hide: 'Verstecken'
@@ -53,6 +54,7 @@ de:
     show: 'Anzeigen'
     show_model: 'Zeige %{model} an'
     _to_ : ' zu '
+    'true': 'True'
     update: 'Speichern'
     update_model: 'Editiere %{model}'
     updated_model: '%{model} aktualisiert'
@@ -100,6 +102,9 @@ de:
       timeText: 'Uhrzeit'
       currentText: 'Jetzt'
       closeText: 'Schließen'
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
     errors:
       template:
         header:

data/config/locales/en.yml

@@ -100,6 +100,10 @@ en:
       showMonthAfterYear: false
       
     datetime_picker_options:
+    
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
       
     errors:
       template:
@@ -109,8 +113,7 @@ en:
           
         body: "There were problems with the following fields:"
         
-      
-      # error_messages
+    # error_messages
     cant_destroy_record: "%{record} can't be destroyed"
     internal_error: 'Request Failed (code 500, Internal Error)'
     version_inconsistency: 'Version inconsistency - this record has been modified since you started editing it.'

data/config/locales/es.yml

@@ -67,8 +67,6 @@ es:
     '<': 'Menor'
     '!=': 'Distinto'
     between: 'Entre'
-    is_null: 'Es nulo'
-    is_not_null: 'No es nulo'
     contains: 'Contiene'
     begins_with: 'Empieza con'
     ends_with: 'Termina con'
@@ -106,6 +104,9 @@ es:
       timeText: 'Hora'
       currentText: 'Ahora'
       closeText: 'Cerrar'
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
     errors:
       template:
         header:
@@ -117,4 +118,5 @@ es:
     cant_destroy_record: "No se pudo borrar %{record}"
     internal_error: 'Petición fallida (código 500, error interno)'
     version_inconsistency: 'Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.'
+    record_not_saved: 'Fallo guardando el registro debido a un error desconocido'
     no_authorization_for_action: "No dispone de autorización para la acción %{action}"

data/config/locales/fr.yml

@@ -104,6 +104,10 @@ fr:
       currentText: 'Maintenant'
       closeText: 'Fermer'
       
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
+
     errors: 
       template: 
         header: 

data/config/locales/hu.yml

@@ -11,6 +11,8 @@ hu:
     click_to_edit: 'Kattints a szerkesztéshez'
     click_to_reset: 'Kattints az alapállapothoz'
     close: 'Bezárás'
+    config_list: 'Configure'
+    config_list_model: 'Configure Columns for %{model}'
     create: 'Létrehozás'
     create_model: '%{model} létrehozása'
     create_another: 'Mégegy hozzáadása'
@@ -25,6 +27,7 @@ hu:
     export: 'Exportálás'
     nested_for_model: '%{nested_model} / %{parent_model}'
     nested_of_model: '%{nested_model} of %{parent_model}'
+    'false': 'False'
     filtered: '(Szűrt)'
     found: 'Találat'
     hide: 'Elrejtés'
@@ -51,6 +54,7 @@ hu:
     show: 'Mutatás'
     show_model: '%{model} mutatása'
     _to_ : ' – '
+    'true': 'True'
     update: 'Modosítás'
     update_model: '%{model} modosítása'
     updated_model: '%{model} módosítva'
@@ -61,12 +65,54 @@ hu:
     '<': '<'
     '!=': '!='
     between: 'Között'
-    is_null: 'Is null'
-    is_not_null: 'Is not null'
     contains: 'Contains'
     begins_with: 'Begins with'
     ends_with: 'Ends with'
+    today: 'Today'
+    yesterday: 'Yesterday'
+    tomorrow: 'Tommorrow'
+    this_week: 'This Week'
+    prev_week: 'Last Week'
+    next_week: 'Next Week'
+    this_month: 'This Month'
+    prev_month: 'Last Month'
+    next_month: 'Next Month'
+    this_year: 'This Year'
+    prev_year: 'Last Year'
+    next_year: 'Next Year'
+    past: 'Past'
+    future: 'Future'
+    range: 'Range'
+    seconds: 'Seconds'
+    minutes: 'Minutes'
+    hours: 'Hours'
+    days: 'Days'
+    weeks: 'Weeks'
+    months: 'Months'
+    years: 'Years'
+    optional_attributes: 'Further Options'
+    null: 'Null'
+    not_null: 'Not Null'
+    date_picker_options:
+      weekHeader: 'Wk'
+      firstDay: 0
+      isRTL: false
+      showMonthAfterYear: false
+      
+    datetime_picker_options:
     
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
+      
+    errors:
+      template:
+        header:
+          one:    "1 error prohibited this %{model} from being saved."
+          other:  "%{count} errors prohibited this %{model} from being saved"
+          
+        body: "There were problems with the following fields:"
+        
     # error_messages
     cant_destroy_record: "nem törölhető: %{record}"
     internal_error: 'A lekérés sikertelen (code 500, Internal Error)'

data/config/locales/ja.yml

@@ -9,7 +9,10 @@ ja:
     are_you_sure_to_delete: '本当によいですか？'
     cancel: 'キャンセル'
     click_to_edit: 'クリックして編集'
+    click_to_reset: 'Click to reset'
     close: '閉じる'
+    config_list: 'Configure'
+    config_list_model: 'Configure Columns for %{model}'
     create: '作成'
     create_model: '%{model}を作成'
     create_another: '別のものを作成'
@@ -24,6 +27,7 @@ ja:
     export: 'Export' # needed?
     nested_for_model: '%{parent_model}の%{nested_model}'
     nested_of_model: '%{nested_model} of %{parent_model}'
+    'false': 'False'
     filtered: '（フィルタ中）'
     found: '個ありました'
     hide: '隠す'
@@ -50,6 +54,7 @@ ja:
     show: '表示'
     show_model: '%{model}を表示'
     _to_ : ' to ' # needed?
+    'true': 'True'
     update: '更新'
     update_model: '%{model}を更新'
     updated_model: '%{model}を更新しました'
@@ -60,12 +65,54 @@ ja:
     '<': '<'
     '!=': '!='
     between: 'Between' # needed?
-    is_null: 'Is null'
-    is_not_null: 'Is not null'
     contains: 'Contains'
     begins_with: 'Begins with'
     ends_with: 'Ends with'
-
+    today: 'Today'
+    yesterday: 'Yesterday'
+    tomorrow: 'Tommorrow'
+    this_week: 'This Week'
+    prev_week: 'Last Week'
+    next_week: 'Next Week'
+    this_month: 'This Month'
+    prev_month: 'Last Month'
+    next_month: 'Next Month'
+    this_year: 'This Year'
+    prev_year: 'Last Year'
+    next_year: 'Next Year'
+    past: 'Past'
+    future: 'Future'
+    range: 'Range'
+    seconds: 'Seconds'
+    minutes: 'Minutes'
+    hours: 'Hours'
+    days: 'Days'
+    weeks: 'Weeks'
+    months: 'Months'
+    years: 'Years'
+    optional_attributes: 'Further Options'
+    null: 'Null'
+    not_null: 'Not Null'
+    date_picker_options:
+      weekHeader: 'Wk'
+      firstDay: 0
+      isRTL: false
+      showMonthAfterYear: false
+      
+    datetime_picker_options:
+    
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
+      
+    errors:
+      template:
+        header:
+          one:    "1 error prohibited this %{model} from being saved."
+          other:  "%{count} errors prohibited this %{model} from being saved"
+          
+        body: "There were problems with the following fields:"
+        
    # error_messages
     cant_destroy_record: "%{record}を削除で来ません"
     internal_error: 'リクエストが失敗しました（コード500: 内部エラー）'

data/config/locales/ru.yml

@@ -27,7 +27,7 @@ ru:
     export: 'Экспорт'
     nested_for_model: '%{parent_model} / %{nested_model}'
     nested_of_model: '%{nested_model} @ %{parent_model}'
-    false: 'Нет'
+    'false': 'Нет'
     filtered: '(Найденное)'
     found: 
       one: 'запись'
@@ -58,7 +58,7 @@ ru:
     show: 'Показать'
     show_model: '%{model}: показать запись'
     _to_ : ' to '
-    true: 'Да'
+    'true': 'Да'
     update: 'Обновить запись'
     update_model: '%{model}: обновить запись'
     updated_model: '%{model}: запись обновлена'
@@ -104,6 +104,10 @@ ru:
       showMonthAfterYear: false
       
     datetime_picker_options:
+    
+    human_conditions:
+      boolean: "%{column} = %{value}"
+      association: "%{column} = %{value}"
       
     errors:
       template:

data/frontends/default/views/_human_conditions.html.erb

@@ -1 +1 @@
-<%= columns.collect {|column| active_scaffold_human_condition_for(column)}.compact.join(I18n.t('support.array.two_words_connector'))  %>
+<%= columns.collect {|column| active_scaffold_human_condition_for(column)}.compact.to_sentence  %>

data/lib/active_scaffold/data_structures/sorting.rb

@@ -97,7 +97,7 @@ module ActiveScaffold::DataStructures
         order << Array(sql).map {|column| "#{column} #{sort_direction}"}.join(', ')
       end
 
-      order.join(', ') unless order.empty?
+      order unless order.empty?
     end
 
     protected

data/lib/active_scaffold/extensions/localize.rb

@@ -1,7 +1,7 @@
 class Object
   def as_(key, options = {})
     unless key.blank?
-      text = I18n.translate "#{key}", {:scope => [:active_scaffold], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
+      text = I18n.translate "#{key}", {:scope => [:active_scaffold, *options.delete(:scope)], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
       # text = nil if text.include?('translation missing:')
     end
     text ||= key 

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -26,11 +26,19 @@ module ActiveScaffold
           when :select, :multi_select, :record_select
             associated = value
             associated = [associated].compact unless associated.is_a? Array
-            associated = column.association.klass.where(["id in (?)", associated.map(&:to_i)]).collect(&:to_label) if column.association
-            "#{column.active_record_class.human_attribute_name(column.name)} = #{associated.join(', ')}"
+            if column.association
+              associated = column.association.klass.where(:id => associated.map(&:to_i)).collect(&:to_label)
+            elsif column.options[:options]
+              associated = associated.collect do |value|
+                text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
+                value = active_scaffold_translated_option(column, text, val).first if text
+                value
+              end
+            end
+            as_(:association, :scope => :human_conditions, :column => column.active_record_class.human_attribute_name(column.name), :value => associated.join(', '))
           when :boolean, :checkbox
             label = column.column.type_cast(value) ? as_(:true) : as_(:false)
-            "#{column.active_record_class.human_attribute_name(column.name)} = #{label}"
+            as_(:boolean, :scope => :human_conditions, :column => column.active_record_class.human_attribute_name(column.name), :value => label)
           when :null
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value.to_sym)}"
           end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 5
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/data_structures/sorting_test.rb

@@ -100,7 +100,7 @@ class SortingTest < Test::Unit::TestCase
     @sorting << [:a, 'desc']
     @sorting << [:b, 'asc']
 
-    assert_equal '"model_stubs"."a" DESC, "model_stubs"."b" ASC', @sorting.clause
+    assert_equal '"model_stubs"."a" DESC, "model_stubs"."b" ASC', @sorting.clause.join(', ')
   end
   
   def test_set_default_sorting_with_simple_default_scope

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 2
-  - 5
-  version: 3.2.5
+  - 6
+  version: 3.2.6
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement