internationalization updates

Gemfile

@@ -47,7 +47,7 @@ group :development do
   gem 'annotate', '~> 2.6.1'
   gem 'quiet_assets'
   gem 'puma'
-  gem 'i18n-tasks', '~> 0.2.10'
+  gem 'i18n-tasks', '~> 0.5.4'
 end
 
 group :test do

Gemfile.lock

@@ -109,7 +109,7 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     dynamic_form (1.1.4)
-    easy_translate (0.4.0)
+    easy_translate (0.5.0)
       json
       thread
       thread_safe
@@ -152,12 +152,12 @@ GEM
     hike (1.2.3)
     http_parser.rb (0.6.0)
     i18n (0.6.9)
-    i18n-tasks (0.2.18)
+    i18n-tasks (0.5.4)
       activesupport
-      easy_translate (>= 0.4.0)
+      easy_translate (>= 0.5.0)
       erubis
       highline
-      rake
+      slop (>= 3.5.0)
       term-ansicolor
       terminal-table
     inherited_resources (1.4.1)
@@ -282,6 +282,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    slop (3.5.0)
     spork (0.9.2)
     sprockets (2.11.0)
       hike (~> 1.2)
@@ -295,17 +296,17 @@ GEM
     sqlite3 (1.3.8)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.2.2)
+    term-ansicolor (1.3.0)
-      tins (~> 0.8)
+      tins (~> 1.0)
     terminal-table (1.4.5)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread (0.1.3)
+    thread (0.1.4)
     thread_safe (0.3.3)
     tilt (1.4.1)
-    tins (0.13.1)
+    tins (1.3.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -360,7 +361,7 @@ DEPENDENCIES
   faker
   geokit
   gravatarify
-  i18n-tasks (~> 0.2.10)
+  i18n-tasks (~> 0.5.4)
   jquery-rails (= 3.0.4)
   json_spec
   kgio

app/admin/dashboard.rb

@@ -1,8 +1,8 @@
 ActiveAdmin.register_page "Dashboard" do
 
-  menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") }
+  menu priority: 1, label: "Dashboard"
 
-  content title: proc{ I18n.t("active_admin.dashboard") } do
+  content title: "Dashboard" do
     columns do
 
       column do

config/locales/en.yml

@@ -8,17 +8,13 @@ en:
       pretty: "%a, %b %e at %l:%M %p"
   about: "About"
   account: "Account"
-  account_changes: "Confirm account changes"
   account_delete: "Delete Account"
   account_deleted: "Your account has been deleted."
   account_delete_message: "Want to delete your account?"
   account_edit: "Edit Account"
-  account_error: "There were some problems creating your account:"
   account_error_edit: "There were some problems editing your account:"
-  account_info: "Account Information"
   account_not_found: "Your account could not be located."
   account_update: "Update Account"
-  account_security: "For security purposes, your current password must be entered."
   action: "Action"
   admin: "Admin"
   ago: "ago"
@@ -31,18 +27,14 @@ en:
   api_key_write: "Write API Key"
   api_key_write_new: "Generate New Write API Key"
   api_keys: "API Keys"
-  api_keys_manage: "Manage API Keys"
-  application_name: "ThingSpeak"
   apps: "Apps"
   authorization: "Authorization"
   average: "Average"
-  back: "Back"
   blog: "Blog"
   channel: "Channel"
   channel_clear: "Clear Channel"
   channel_clear_message: "Want to clear all feed data from this channel?"
   channel_create: "Create New Channel"
-  channel_edit: "Edit Channel"
   channel_error: "There were some problems creating your channel:"
   channel_update_success: "The Channel was updated."
   channel_feed: "Channel Feed"
@@ -59,17 +51,13 @@ 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_public: "Viewing public channel"
-  channel_public_view: "Public View"
   channel_update: "Update Channel"
   channel_url: "URL"
   channels: "Channels"
   channels_my: "My Channels"
   channels_public: "Public Channels"
   channels_public_view: "View Public Channels"
-  channel_being_cleared: "This channel is currently being cleared. Any data you post to this channel before clearing is complete may be deleted."
   channel_video_type_blank: "Either Youtube, or Vimeo, is required if a Video ID is specified."
-  chart: "Chart"
   chart_max: "Data Max"
   chart_min: "Data Min"
   chart_background_color: "Background"
@@ -87,12 +75,10 @@ en:
   chart_yaxis_min: "Y-Axis Min"
   chart_yaxis_max: "Y-Axis Max"
   charts: "Charts"
-  charts_view: "View Charts"
   comment_add: "Add comment"
   comment_flag: "Report Abuse"
   comment_reply: "reply"
   comment_reported: "Reported!"
-  community: "Community"
   confirm_account_delete: "Are you sure you want to delete your account? This cannot be undone."
   confirm_read_key_delete: "Are you sure you want to delete this Read API Key?"
   confirm_channel_clear: "Are you sure you want to clear this channel?"
@@ -121,7 +107,6 @@ en:
   days: "Days"
   delete: "delete"
   developer_info: "Developer Info"
-  device: "Device"
   device_create: "Add New Device"
   device_custom_mac: "Enter Custom MAC Address"
   device_default_name: "Device"
@@ -149,29 +134,22 @@ en:
   download_feeds: "Download all of this Channel's feeds in CSV format."
   edit: "Edit"
   elevation: "Elevation"
-  entries: "Entries"
   email: "Email"
   email_address: 'email address'
-  email_form_add: "Add Email"
   export: "Export"
   featured_channels: "Featured Channels"
   selected_channels: "Channels"
   features: "Features"
   field: "Field"
-  footer: "This is the footer message."
   forgot: "Forgot your password?"
   forum: "Forum"
   for_more_information: "More Information"
   generate_thingtweet_arduino_code: "Generate ThingTweet Arduino Code"
   get_started: "Get Started Now"
   height: "Height"
-  home: "Home"
-  homepage: "ThingSpeak is an Open Internet of Things project by ioBridge."
-  homepage_logged_in: "Homepage for logged in user!"
   home_motto: "Billions and Billions."
   home_tagline: "The open data platform for the Internet of Things."
   import: "Import"
-  import_data: "Import Data"
   latitude: "Latitude"
   longitude: "Longitude"
   median: "Median"
@@ -180,9 +158,7 @@ en:
   message_field: "Message Field"
   metadata: 'metadata'
   myaccount: "My Account"
-  mychannels: "My Channels"
   new: "New"
-  news: "News"
   note: "Note"
   note_save: "Save Note"
   password: "Password"
@@ -192,12 +168,7 @@ en:
   password_forgot: "Forgot your password?"
   password_forgot_message: "Enter your email address below and we'll send you a link where you can reset your password."
   password_incorrect: "Your current password was not entered correctly."
-  password_link_expired: "Your password reset link has expired."
   password_new: "Create New Password"
-  password_new_choose: "Choose a secure password for your account."
-  password_new_confirmation: "Enter your password again for confirmation."
-  password_new_error: "There were some problems with your new password:"
-  password_problem: "Your password is too short or your confirmation did not match."
   password_reset_message1: "A request to reset your password has been made."
   password_reset_message2: "If you did not make this request, simply ignore this email."
   password_reset_message3: "If you did make this request, please follow the link below:"
@@ -211,10 +182,10 @@ en:
   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_permission: "You don't have permission to access this plugin!"
   plugin_save: "Save Plugin"
   plugins: "Plugins"
   plugin_private_flag: "Private?"
@@ -227,16 +198,14 @@ en:
   profile_view: "View Public Profile"
   profile_website: "Website"
   public: "Make Public?"
-  public_header: "Public?"
   public_profile: "Public Profile"
-  public_true: "This channel is public"
-  questions: "Questions"
   react: "React"
   react_header_name: "Name"
   react_new_button: "Create New 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_channel_error: "'%{channel_name}' request doesn't belong to you"
+  react_thingtweet_error: "'%{twitter_account_name}' Twitter account doesn't belong to you"
+  react_channel_error: "'%{channel_name}' channel doesn't belong to you"
   react_invalid_error: "%{value} is not a valid value"
   react_invalid_number_error: "%{value} is not a value field number"
   react_invalid_condition_error: "%{value} is not a valid condition"
@@ -273,7 +242,6 @@ en:
   react_condition_geo: "km from"
   react_latitude: "latitude"
   react_longitude: "longitude"
-  react_delete: "Delete this React"
   react_twitter_delete_warning1: "Cannot delete this twitter account as it is used by %{reacts_count}: %{reacts_list}"
   react_twitter_delete_warning2: "Please delete or modify this react before unlinking this twitter account."
   react_thinghttp_delete_warning1: "Cannot delete this ThingHTTP as it is used by %{reacts_count}: %{reacts_list}"
@@ -283,7 +251,6 @@ en:
   react_label_test_frequency: "Test Frequency"
   react_label_react_name: "React Name"
   react_label_condition_type: "Condition Type"
-  react_label_action: "Action"
   react_label_options: "Options"
   react_action_tweet_prefix: "then tweet"
   react_action_tweet_suffix: "using Twitter account"
@@ -294,7 +261,6 @@ en:
   react_save_button: "Create React"
   remember_me: "Remember my User ID"
   results: "Results"
-  rss: "RSS Feed"
   save: "Save"
   saved: "Saved."
   saved_error: "Error while saving data."
@@ -304,8 +270,6 @@ en:
   search_empty: "No search results were found."
   search_input_tag: "Enter tag"
   search_input_username: "Enter username"
-  secure_signin: "Secure Sign In"
-  select_file: "Please choose a file to upload."
   signin: "Sign In"
   signin_failure: "Sign In Failure"
   signin_please: "Please sign in to access your account."
@@ -323,7 +287,6 @@ en:
   social_channel_error_slug_exists: "Slug is already taken."
   social_channel_new: "New Social Channel"
   social_saved: "Submitted, thank you!"
-  status_messages: "Status Messages"
   submit: "Submit"
   sum: "Sum"
   scheduled_thinghttp: "Scheduled ThingHTTP"
@@ -331,7 +294,6 @@ en:
   scheduled_thinghttp_new_button: "New Scheduled ThingHTTP"
   scheduled_thinghttp_delete_confirm: "Are you sure you wish to delete this scheduled ThingHTTP?"
   scheduled_thinghttp_label_name: "Name"
-  scheduledthinghttp_label_frequency: "Frequency"
   scheduled_thinghttp_save_button: "Save Scheduled ThingHTTP"
   scheduled_thinghttp_create_button: "Create Scheduled ThingHTTP"
   scheduledthinghttp_default_name: "Scheduled ThingHTTP"
@@ -355,9 +317,11 @@ en:
   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:"
   talkback_id: "TalkBack ID"
   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"
@@ -369,6 +333,7 @@ en:
   thinghttp_delete: "Delete Request"
   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"
   thinghttp_header_remove: "remove header"
@@ -376,7 +341,6 @@ en:
   thinghttp_headers: "Headers"
   thinghttp_host: "Host"
   thinghttp_http_version: "HTTP Version"
-  thinghttp_id: "Request ID"
   thinghttp_invalid_api_key: "Invalid API Key"
   thinghttp_loop: "Please don't try to send ThingHTTP into a loop!"
   thinghttp_method: "Method"
@@ -404,7 +368,6 @@ en:
   tweetcontrol_edit: "Update TweetControl"
   tweetcontrol_thinghttp: "ThingHTTP Action"
   tweetcontrol_trigger: "Trigger"
-  twitter_accounts: "Current Twitter accounts"
   twitter_delete: "Unlink Account"
   twitter_failure: "Twitter failure."
   twitter_invalid_api_key: "Invalid API Key"
@@ -427,11 +390,9 @@ en:
   video_id: "Video ID"
   view: "view"
   vimeo: "Vimeo"
-  watch_channel: "Watch this channel"
   watched_channels: "Watched Channels"
   watched_empty: "You aren't watching any channels."
   watched_find: "Find some channels to watch."
-  watched_view: "View Watched Channels"
   public_link: "Public"
   private_link: "Private"
   settings_link: "Settings"
@@ -492,7 +453,6 @@ en:
   help_tweetcontrol_trigger: "Fill in a trigger to listen for."
   help_options: "more help"
   help_react: "React allow you to trigger a ThingHTTP request or send a tweet using ThingTweet when your ThingSpeak Channel meets a certain condition. "
-  help_react_create: "Create your React condition here."
   help_react_edit: "Update your React condition here."
   help_react_edit1: "Select a condition type to correspond with the type of data you wish to check and set your condition values."
   help_react_edit2: "Use the Test Frequency setting to choose to test your condition on every insert or on a periodic basis."
@@ -504,7 +464,6 @@ en:
   window_channel_video: "Channel Video"
   window_field_chart: "Field %{field_number} Chart"
   window_plugin: "%{name} (Plugin)"
-  portlets_available: "Available Windows"
   private_view: "Private View"
   public_view: "Public View"
   channel_settings: "Channel Settings"