update internationalizations

app/views/channels/_edit.html.erb

@@ -103,7 +103,7 @@
       </tr>
       <tr>
         <td class="left"></td>
-        <td><%= c.submit t(:channel_update), class: 'btn btn-primary' %></td>
+        <td><%= c.submit t(:save_model, model: 'Channel'), class: 'btn btn-primary' %></td>
       </tr>
     </table>
   <% end %>
@@ -116,7 +116,7 @@
   <br><br>
 
   <h4><%= t(:channel_delete_message) %></h4>
-  <%= button_to t(:channel_delete), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) }, class: 'btn btn-danger' %>
+  <%= button_to t(:delete_model, model: 'Channel'), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) }, class: 'btn btn-danger' %>
 </div>
 <div id="sidebar_old">
 <ul>

app/views/channels/index.html.erb

@@ -5,7 +5,7 @@
 
     <div class="col-pad" data-no-turbolink>
 
-      <%= button_to t(:channel_create), channels_path, :method => :post, :class => 'btn btn-primary' %><br>
+      <%= button_to t(:new_model, model: 'Channel'), channels_path, :method => :post, :class => 'btn btn-primary' %><br>
 
       <% if @channels.length > 0 %>
 

app/views/plugins/edit.html.erb

@@ -58,7 +58,7 @@
 
     <div class="form-group">
       <label class="col-sm-2 control-label"></label>
-      <div class="col-sm-10"><p class="form-control-static"><%= c.submit t(:plugin_save), :class => 'btn btn-primary' %></p></div>
+      <div class="col-sm-10"><p class="form-control-static"><%= c.submit t(:save_model, model: 'Plugin'), :class => 'btn btn-primary' %></p></div>
     </div>
 
   <% end %>
@@ -66,7 +66,7 @@
   <br><br>
 
   <h3><%= t(:plugin_delete_message) %></h3>
-  <%= button_to t(:plugin_delete), plugin_path(@plugin.id), :method => 'delete', :data => { :confirm => t(:confirm_plugin_delete) }, :class => 'btn btn-danger' %>
+  <%= button_to t(:delete_model, model: 'Plugin'), plugin_path(@plugin.id), :method => 'delete', :data => { :confirm => t(:confirm_plugin_delete) }, :class => 'btn btn-danger' %>
 
 </div>
 

app/views/plugins/index.html.erb

@@ -5,7 +5,7 @@
 
     <div class="col-pad">
 
-      <%= link_to t(:plugin_new), new_plugin_path, class: 'btn btn-primary' %>
+      <%= link_to t(:new_model, model: 'Plugin'), new_plugin_path, class: 'btn btn-primary' %>
       <br><br>
 
       <% if @plugins.length > 0 %>

app/views/plugins/new.html.erb

@@ -7,7 +7,7 @@
     </ol>
 
     <div class="col-pad">
-      <h3><%= t(:plugin_new) %></h3>
+      <h3><%= t(:new_model, model: 'Plugin') %></h3>
       <br>
       <div><%= t(:plugin_new_message) %></div>
       <br>
@@ -37,7 +37,7 @@
         <div class="form-group">
           <div class="col-sm-offset-3 col-sm-9">
             <p class="form-control-static">
-              <%= f.submit t(:plugin_create), :class => 'btn btn-primary' %>
+              <%= f.submit t(:create_model, model: 'Plugin'), :class => 'btn btn-primary' %>
             </p>
           </div>
         </div>

config/locales/en.yml

@@ -34,13 +34,11 @@ en:
   channel: "Channel"
   channel_clear: "Clear Channel"
   channel_clear_message: "Want to clear all feed data from this channel?"
-  channel_create: "Create New Channel"
   channel_error: "There were some problems creating your channel:"
   channel_update_success: "The Channel was updated."
   channel_feed: "Channel Feed"
   channel_default_field: "Field Label"
   channel_default_name: "Channel"
-  channel_delete: "Delete Channel"
   channel_delete_message: "Want to delete this channel?"
   channel_description: "Description"
   channel_directions: "Directions"
@@ -51,7 +49,6 @@ en:
   channel_ranking: "Percentage Complete"
   channel_not_public: "This channel is not public."
   channel_permission: "You don't have permission to view that channel!"
-  channel_update: "Update Channel"
   channel_url: "URL"
   channels: "Channels"
   channels_my: "My Channels"
@@ -105,11 +102,13 @@ en:
   contact_us_no_message: "Please add a message to the Contact Us form."
   contact_us_success: "Your message has been sent successfully."
   create_account: "Create Account"
+  create_model: "Create %{model}"
   created: "Created"
   data: "Data"
   days: "Days"
   default: 'default'
   delete: "delete"
+  delete_model: "Delete %{model}"
   developer_info: "Developer Info"
   device_create: "Add New Device"
   device_custom_mac: "Enter Custom MAC Address"
@@ -137,6 +136,7 @@ en:
   download: "Download"
   download_feeds: "Download all of this Channel's feeds in CSV format."
   edit: "Edit"
+  edit_model: "Edit %{model}"
   elevation: "Elevation"
   email: "Email"
   email_address: 'email address'
@@ -168,6 +168,7 @@ en:
   myaccount: "My Account"
   name: 'name'
   new: "New"
+  new_model: "New %{model}"
   note: "Note"
   note_save: "Save Note"
   one_time: 'one time'
@@ -191,15 +192,12 @@ en:
   plugin_create: "Create Plugin"
   plugin_css: "CSS"
   plugin_default_name: "Plugin"
-  plugin_delete: "Delete Plugin"
   plugin_delete_message: "Want to delete this Plugin?"
   plugin_error: "There were some problems creating your plugin:"
   plugin_html: "HTML"
   plugin_js: "JavaScript"
   plugin_name: "Name"
-  plugin_new: "New Plugin"
   plugin_new_message: "Please select a template to use with your new plugin."
-  plugin_save: "Save Plugin"
   plugin_template: "Plugin Template"
   plugins: "Plugins"
   plugin_public_flag: "Make Public?"
@@ -215,8 +213,6 @@ en:
   public_profile: "Public Profile"
   react: "React"
   react_header_name: "Name"
-  react_new_button: "Create New React"
-  react_delete: "Delete React"
   react_delete_confirm: "Are you sure you wish to delete this condition?"
   react_thinghttp_error: "'%{thinghttp_name}' request doesn't belong to you"
   react_thingtweet_error: "'%{twitter_account_name}' Twitter account doesn't belong to you"
@@ -273,12 +269,11 @@ en:
   react_action_thinghttp_prefix: "then perform ThingHTTP"
   react_option_run_first_time: "Run action only the first time the condition is met"
   react_option_run_every_time: "Run action each time condition is met"
-  react_create_button: "Create React"
-  react_save_button: "Create React"
   recurring: 'recurring'
   remember_me: "Remember my User ID"
   results: "Results"
   save: "Save"
+  save_model: "Save %{model}"
   saved: "Saved."
   saved_error: "Error while saving data."
   search: "search"
@@ -317,8 +312,6 @@ en:
   talkback_command_position: "Position"
   talkback_command_remove: "Remove command"
   talkback_commands: "Commands"
-  talkback_create: "New TalkBack"
-  talkback_delete: "Delete TalkBack"
   talkback_delete_message: "Want to delete this TalkBack?"
   talkback_edit: "Edit TalkBack"
   talkback_error: "There were some problems creating your TalkBack:"
@@ -326,17 +319,13 @@ en:
   talkback_name: "Name"
   talkback_new_api_key: "Regenerate API Key"
   talkback_permission: "This TalkBack doesn't belong to you."
-  talkback_update: "Update TalkBack"
   thinghttp: "ThingHTTP"
   thinghttp_auth_name: "HTTP Auth Username"
   thinghttp_auth_pass: "HTTP Auth Password"
   thinghttp_body: "Body"
   thinghttp_content_type: "Content Type"
-  thinghttp_create: "Create New Request"
   thinghttp_default_name: "Request"
-  thinghttp_delete: "Delete Request"
+  thinghttp_delete_message: "Want to delete this ThingHTTP?"
-  thinghttp_delete_message: "Want to delete this Request?"
-  thinghttp_edit: "Edit Request"
   thinghttp_error: "There were some problems creating your ThingHTTP:"
   thinghttp_header_add: "add new header"
   thinghttp_header_name: "Name"
@@ -353,7 +342,6 @@ en:
   thinghttp_parse: "Parse String"
   thinghttp_parse_error: "Error parsing document, try a different parse string."
   thinghttp_permission: "You don't have permission to view that ThingHTTP!"
-  thinghttp_update: "Update Request"
   thingtweet: "ThingTweet"
   thingtweet_arduino_select_message: "Select Twitter account to use for this code"
   thingtweet_back: "Back to ThingTweet"
@@ -361,13 +349,11 @@ en:
   timecontrols: "TimeControls"
   timecontrol_date: 'date'
   timecontrol_days: 'days'
-  timecontrol_delete: "Delete TimeControl"
   timecontrol_delete_message: "Want to delete this TimeControl?"
-  timecontrol_edit: "Edit TimeControl"
   timecontrol_error: "There were some problems creating your TimeControl:"
   timecontrol_fuzzy_time: 'fuzzy time'
   timecontrol_max_message: "You have reached the maximum number of TimeControls available per user. Please delete an existing TimeControl before adding a new one."
-  timecontrol_new: "New TimeControl"
+  timecontrol_permission: "You don't have permission to view that TimeControl!"
   timecontrol_run_at: 'run at'
   timecontrol_time: 'time'
   timecontrol_twitter_delete_warning1: "Cannot delete this Twitter account as it is used by %{timecontrols_count}: %{timecontrols_list}"
@@ -382,11 +368,8 @@ en:
   try_again: "Please try again!"
   tutorials: "Tutorials"
   tweetcontrol: "TweetControl"
-  tweetcontrol_delete: "Delete TweetControl"
   tweetcontrol_delete_message: "Want to delete this TweetControl?"
   tweetcontrol_error: "There were some problems creating your TweetControl:"
-  tweetcontrol_new: "Create New TweetControl"
-  tweetcontrol_edit: "Update TweetControl"
   tweetcontrol_thinghttp: "ThingHTTP Action"
   tweetcontrol_trigger: "Trigger"
   twitter_delete: "Unlink Account"