removing dependence on localized strings for day/week/month/year sepa…

…ration

app/controllers/recurring_tasks_controller.rb

@@ -83,6 +83,6 @@ def find_recurring_task
   end
 
   def set_interval_units
-    @interval_units = RecurringTask::INTERVAL_UNITS
+    @interval_units = RecurringTask::INTERVAL_UNITS_LOCALIZED
   end
 end

app/models/recurring_task.rb

@@ -4,30 +4,88 @@ class RecurringTask < ActiveRecord::Base
   belongs_to :issue, :foreign_key => 'current_issue_id'
   has_one :project, through: :issue
 
+  attr_accessible :interval_localized_name
+
+  # these are the flags used in the database to denote the interval
+  # the actual text displayed to the user is controlled in the language file
+  INTERVAL_DAY = 'd'
+  INTERVAL_WEEK = 'w'
+  INTERVAL_MONTH = 'm'
+  INTERVAL_YEAR = 'y'
+
   # must come before validations otherwise unitialized
-  INTERVAL_UNITS = [l(:interval_day), l(:interval_week), l(:interval_month), l(:interval_year)]
+  INTERVAL_UNITS_LOCALIZED = [l(:interval_day), l(:interval_week), l(:interval_month), l(:interval_year)]
 
-  validates :interval_unit, presence: true, inclusion: { in: RecurringTask::INTERVAL_UNITS, message: "#{l(:error_invalid_interval)} %{value}" }
+  validates :interval_localized_name, presence: true, inclusion: { in: RecurringTask::INTERVAL_UNITS_LOCALIZED, message: "#{l(:error_invalid_interval)} %{value}" }
   validates :interval_number, presence: true, numericality: {only_integer: true, greater_than: 0}
   # cannot validate presence of issue if want to use other features
   # validates :issue, presence: true
   # validates :fixed_schedule # requiring presence requires true
 
   validates_associated :issue # just in case we build in functionality to add an issue at the same time, verify the issue is ok  
 
+  def interval_localized_name
+    case interval_unit
+    when INTERVAL_DAY
+      l(:interval_day)
+    when INTERVAL_WEEK
+      l(:interval_week)
+    when INTERVAL_MONTH
+      l(:interval_month)
+    when INTERVAL_YEAR
+      l(:interval_year)
+    else
+      logger.error "#{l(:error_invalid_interval)} %{interval_unit}"
+    end  
+  end
+
+  # text for the interval name
+  def interval_localized_name=(value)
+    interval_unit = case value
+      when l(:interval_day)
+        INTERVAL_DAY
+      when l(:interval_week)
+        INTERVAL_WEEK
+      when l(:interval_month)
+        INTERVAL_MONTH
+      when l(:interval_year)
+        INTERVAL_YEAR
+      else
+        logger.error "Could not find matching value for localized interval name #{interval}." # TODO localize
+        ""
+      end
+  end  
+
+  # interval database name for the localized text
+  def self.interval_value interval
+    case interval
+    when l(:interval_day)
+      INTERVAL_DAY
+    when l(:interval_week)
+      INTERVAL_WEEK
+    when l(:interval_month)
+      INTERVAL_MONTH
+    when l(:interval_year)
+      INTERVAL_YEAR
+    else
+      logger.error "Could not find matching value for localized interval name #{interval}." # TODO localize
+      ""
+    end
+  end
+
   # time interval value of the recurrence pattern
   def recurrence_pattern
     case interval_unit
-    when l(:interval_day)
+    when INTERVAL_DAY
       interval_number.days
-    when l(:interval_week)
+    when INTERVAL_WEEK
       interval_number.weeks
-    when l(:interval_month)
+    when INTERVAL_MONTH
       interval_number.months
-    when l(:interval_year)
+    when INTERVAL_YEAR
       interval_number.years
     else
-      logger.error "Unsupported interval unit: #{interval_unit}"
+      logger.error "#{l(:error_invalid_interval)} %{interval_unit}"
     end
   end
 

app/views/recurring_tasks/_form.html.erb

@@ -4,7 +4,7 @@
     <p><%= f.hidden_field :id %></p>
     <p><%= label(:recurring_task, :current_issue_id, l(:field_issue)) %><%= collection_select('recurring_task', 'current_issue_id', @recurrable_issues, :id, :subj_date) %></p>
     <p><%= f.number_field :interval_number %></p>
-    <p><%= label(:recurring_task, :interval_unit, l(:field_interval_unit)) %><%= select 'recurring_task', 'interval_unit', @interval_units %></p>
+    <p><%= label(:recurring_task, :interval_localized_name, l(:field_interval_unit)) %><%= select 'recurring_task', 'interval_localized_name', @interval_units %></p>
     <p><%= f.check_box :fixed_schedule %> </p>
     <p><%= f.submit %></p>
 <% end %>

app/views/recurring_tasks/index.html.erb

@@ -22,7 +22,7 @@
                 	<!-- TODO Localize -->
                 	<% if !@project %><td><%= rt.project.nil? ? 'N/A' : link_to(rt.project, project_path(rt.project)) %></td><% end %>
                     <td><%= rt.issue.nil? ? l(:label_recurring_task_issue_empty) : link_to(rt.issue.subj_date, {:action => 'show', :id => rt.id, :project_id => rt.project.id}) %></td>
-                    <td><%= pluralize(rt.interval_number, rt.interval_unit) %></td>
+                    <td><%= pluralize(rt.interval_number, rt.interval_localized_name) %></td>
                     <td><%= rt.fixed_schedule %></td>
                     <td><%= format_date(rt.next_scheduled_recurrence) %></td>
                     <td><%= edit_button rt %></td>

app/views/recurring_tasks/show.html.erb

@@ -4,7 +4,7 @@
 
 <h2><%= @recurring_task.issue.nil? ? l(:label_recurring_task_issue_empty) : link_to(@recurring_task.issue.subj_date, {:controller => 'issues', :action => 'show', :id => @recurring_task.issue.id}) %></h2>
 
-<p><%= l(:label_recurrence_pattern) %> <%= pluralize(@recurring_task.interval_number, @recurring_task.interval_unit) %></p>
+<p><%= l(:label_recurrence_pattern) %> <%= pluralize(@recurring_task.interval_number, @recurring_task.interval_localized_name) %></p>
 <p><%= @recurring_task.fixed_schedule ? l(:label_recurs_fixed) : l(:label_recurs_dependent) %></p>
 
 <p><%= l(:label_next_scheduled_run) %>: <%= format_date(@recurring_task.next_scheduled_recurrence) %></p>