Merge pull request gregschmit#74 from GetJobber/dandycoding-master

Dandycoding master

Author: benzittlau

README.md

@@ -101,6 +101,7 @@ For other languages include a JavaScript file like this:
 
 ```coffeescript
 $.fn.recurring_select.texts = {
+  locale_iso_code: "fr"
   repeat: "Repeat"
   frequency: "Frequency"
   daily: "Daily"

app/assets/javascripts/recurring_select.js.coffee

@@ -80,6 +80,7 @@ $.fn.recurring_select.options = {
 }
 
 $.fn.recurring_select.texts = {
+  locale_iso_code: "en"
   repeat: "Repeat"
   last_day: "Last Day"
   frequency: "Frequency"

app/assets/javascripts/recurring_select/fr.js.coffee

@@ -1,4 +1,5 @@
 $.fn.recurring_select.texts = {
+  locale_iso_code: "fr"
   repeat: "Récurrence"
   last_day: "Dernier jour"
   frequency: "Fréquence"

app/assets/javascripts/recurring_select_dialog.js.coffee.erb

@@ -102,10 +102,15 @@ window.RecurringSelectDialog =
       interval_input.val(@current_rule.hash.interval)
       interval_input.on "change keyup", @intervalChanged
 
+      # clear selected days
+      section.find(".day_holder a").each (index, element) ->
+        $(element).removeClass("selected")
+
       # connect the day fields
       if @current_rule.hash.validations? && @current_rule.hash.validations.day?
         $(@current_rule.hash.validations.day).each (index, val) ->
           section.find(".day_holder a[data-value='"+val+"']").addClass("selected")
+
       section.off('click', '.day_holder a').on "click", ".day_holder a", @daysChanged
 
       section.show()
@@ -160,8 +165,9 @@ window.RecurringSelectDialog =
 
     summaryFetch: ->
       return if !(@current_rule.hash? && (rule_type = @current_rule.hash.rule_type)?)
+      @current_rule.hash['week_start'] = $.fn.recurring_select.texts["first_day_of_week"]
       $.ajax
-        url: "<%= Rails.application.config.action_controller.relative_url_root %>/recurring_select/translate",
+        url: "<%= Rails.application.config.action_controller.relative_url_root %>/recurring_select/translate/#{$.fn.recurring_select.texts["locale_iso_code"]}",
         type: "POST",
         data: @current_rule.hash
         success: @summaryFetchSuccess
@@ -196,12 +202,14 @@ window.RecurringSelectDialog =
 
       for num, index in [1, 2, 3, 4, 5, -1]
         if show_row[index]
-          monthly_calendar.append "<span>#{row_labels[index]}</span>"
-          for day_of_week in [0..6]
-            day_link = $("<a>", {text: cell_str[day_of_week]})
+          monthly_calendar.append "<span>#{row_labels[num - 1]}</span>"
+          for day_of_week in [$.fn.recurring_select.texts["first_day_of_week"]...(7 + $.fn.recurring_select.texts["first_day_of_week"])]
+            day_of_week = day_of_week % 7
+            day_link = $("<a>", {text: cell_str[day_of_week] })
             day_link.attr("day", day_of_week)
             day_link.attr("instance", num)
             monthly_calendar.append day_link
+
       $.each @current_rule.hash.validations.day_of_week, (key, value) ->
         $.each value, (index, instance) ->
           section.find("a[day='#{key}'][instance='#{instance}']").addClass("selected")
@@ -250,7 +258,6 @@ window.RecurringSelectDialog =
       @current_rule.hash.interval = parseInt($(event.currentTarget).val())
       if @current_rule.hash.interval < 1 || isNaN(@current_rule.hash.interval)
         @current_rule.hash.interval = 1
-        # $(event.currentTarget).val(@current_rule.hash.interval)
       @summaryUpdate()
 
     daysChanged: (event) =>

app/middleware/recurring_select_middleware.rb

@@ -7,7 +7,9 @@ def initialize(app)
   end
 
   def call(env)
-    if env["PATH_INFO"] =~ /^\/recurring_select\/translate/
+    regexp = /^\/recurring_select\/translate\/(.*)/
+    if env["PATH_INFO"] =~ regexp
+      I18n.locale = env["PATH_INFO"].scan(regexp).first.first
       request = Rack::Request.new(env)
       params = request.params
       params.symbolize_keys!