lib/olelo/attributes.rb in olelo-0.9.3 vs lib/olelo/attributes.rb in olelo-0.9.4

@@ -17,16 +17,16 @@
         @name = name.to_s
         @key = ['attribute', parent.path, name].compact.join('_')
       end
 
       def label
-        @label ||= Locale.translate(key, :fallback => titlecase(name))
+        @label ||= Locale.translate(key, fallback: titlecase(name))
       end
 
       def label_tag
         type = self.class.name.split('::').last.downcase
-        title = Locale.translate("type_#{type}", :fallback => titlecase(type))
+        title = Locale.translate("type_#{type}", fallback: titlecase(type))
         %{<label for="#{key}" title="#{escape_html title}">#{escape_html label}</label>}
       end
 
       def build_form(attr)
         "#{label_tag}#{field_tag(attr)}<br/>"
@@ -117,11 +117,11 @@
 
       class Suggestions < Enum
         def field_tag(attr)
           %{<input class="observe" type="text" id="#{key}" name="#{key}" value="#{escape_html(values[attr] || attr)}"/>
             <script type="text/javascript">
-            $('##{key}').combobox({ source: #{escape_javascript values.values.sort.to_json} });
+            $('##{key}').combobox({ source: #{escape_javascript MultiJson.dump(values.values.sort)} });
             </script>}
         end
 
         def parse(params)
           value = params[key]
@@ -147,10 +147,10 @@
         @path = parent ? [parent.path, name].compact.join('_') : nil
         @children = {}
       end
 
       def label
-        @label ||= name.blank? ? '' : Locale.translate("group_#{path}", :fallback => titlecase(name))
+        @label ||= name.blank? ? '' : Locale.translate("group_#{path}", fallback: titlecase(name))
       end
 
       # Build form for this group
       # @return [String] html
       # @api private