translation_center 1.0.4 → 1.1.0

data/app/assets/javascripts/translation_center/application.js

@@ -39,4 +39,19 @@ $(document).ready(function(){
 
   $('.dropdown-toggle').dropdown()
 
+  // search for key with that name and jump to it when clicked
+  $('#search_keys').typeahead({
+    // note that "value" is the default setting for the property option
+    source: function (query, process) {
+      return $.get(Routes['translation_center_search_translation_keys_path'] + '.json', { query: query }, function (data) {
+        return process(data);
+      });
+    },
+    updater: function(item) {
+      document.location = Routes['translation_center_search_translation_keys_path'] + '?search_key_name=' + item
+    }
+
+  });
+    
+
 });

data/app/assets/javascripts/translation_center/routes.js

@@ -3,6 +3,7 @@ Routes = {
   translation_center_set_lang_to_path: translation_center_root + 'set_language_to/',
   translation_center_set_lang_from_path: translation_center_root + 'set_language_from/',
   translation_center_search_activity_path: translation_center_root + 'search_activity',
+  translation_center_search_translation_keys_path: translation_center_root + '/translation_keys/search',
   translation_center_translation_key_path: function(id) { translation_center_root + 'translation_keys/' + id },
   translation_center_category_more_keys_path: function(id) { return translation_center_root + 'categories/' + id + '/more_keys' },
   translation_center_translation_accept_path: function(id) { return translation_center_root + 'translations/' + id + '/accept' },

data/app/assets/stylesheets/translation_center/application.css

@@ -23,10 +23,14 @@
 .navbar span {
   margin-left: 5px;
 }
-.navbar .brand,.navbar span, .navbar .nav > li > a {
+.navbar .brand,.navbar span, .navbar .nav > li > a, .navbar a, .navbar .nav_text {
   color: white !important;
 }
 
+.navbar li.dropdown ul.dropdown-menu a.language_to {
+  color: black !important;
+}
+
 .navbar-inner {
   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #009ED2), color-stop(100%, #008CBA)) !important;
 }

data/app/controllers/translation_center/translation_keys_controller.rb

@@ -2,7 +2,7 @@ require_dependency "translation_center/application_controller"
 
 module TranslationCenter
   class TranslationKeysController < ApplicationController
-    before_filter :get_translation_key
+    before_filter :get_translation_key, except: [ :search ]
     before_filter :can_admin?, only: [ :destroy, :update ]
 
     # POST /translation_keys/1/update_translation.js
@@ -73,13 +73,29 @@ module TranslationCenter
     # DELETE /translation_keys/1
     # DELETE /translation_keys/1.json
     def destroy
-      @translation_key = TranslationKey.find(params[:id])
+      @category = @translation_key.category
       @translation_key_id = @translation_key.id
       @key_status = @translation_key.status(session[:lang_to])
       @translation_key.destroy
   
       respond_to do |format|
         format.js
+        format.html {redirect_to @category, notice: I18n.t('translation_center.translation_keys.destroyed_successfully')}
+      end
+    end
+
+    # GET /translation_keys/search.json
+    def search
+      # if full name provided then get the key and redirect to it, otherwise return similar in json
+      if params[:search_key_name].present?
+        @translation_key = TranslationKey.find_by_name(params[:search_key_name])
+      else
+        @key_names = TranslationKey.where('name LIKE ?', "%#{params[:query]}%")
+      end
+
+      respond_to do |format|
+        format.html { redirect_to @translation_key}
+        format.json { render json: @key_names.map(&:name) }
       end
     end
 

data/app/views/layouts/translation_center/application.html.haml

@@ -51,12 +51,27 @@
                         = language_name(locale)
               - if translation_admin?
                 .pull-left.nav_text
-                  = link_to t('translation_center.dashboard'), dashboard_path
+                  %span
+                    = link_to t('translation_center.dashboard'), dashboard_path
+              %li.divider-vertical
+              %form.navbar-search
+                %input#search_keys.search-query{placeholder: t('translation_center.search_keys'), type: "text", autocomplete: :off}
 
             %ul.nav.pull-right
               %li
                 = link_to t('translation_center.back_to_app'), main_app.root_path, target: Rails.application.class.parent_name
+    - if flash[:alert] 
+      .alert.alert-error
+        %button{ type: 'button', class: 'close', 'data-dismiss' => 'alert' }
+          ×
+        = flash[:alert]
 
+    - if flash[:notice]
+      .alert.alert-success
+        %button{ type: 'button', class: 'close', 'data-dismiss' => 'alert' }
+          ×
+        = flash[:notice]
+        
     .container
       .row
         .span12

data/app/views/translation_center/translation_keys/show.html.haml

@@ -1,4 +1,8 @@
-= link_to t('.back_to_category'), @translation_key.category
+= link_to "#{t('.back_to_category')} #{@translation_key.category.name.titleize}", @translation_key.category, class: 'btn btn-primary'
+
 %h1
   = @translation_key.name
+  - if translation_admin?
+    = link_to t('.destroy'), @translation_key, method: :delete, data: { confirm: t('actions.are_you_sure', :default => 'Are you sure?') }, class: 'btn btn-danger'
+
 = render 'translation_center/translation_keys/show', translation_key: @translation_key, index: 0

data/config/routes.rb

@@ -10,6 +10,9 @@ TranslationCenter::Engine.routes.draw do
   resources :translation_keys do
     post :update_translation
     get :translations
+    collection do 
+      get :search
+    end
   end
 
   resources :categories  do

data/lib/translation_center/translation_helpers.rb

@@ -31,7 +31,8 @@ module TranslationCenter
 
   # wraps a span if inspector option is set to all
   def wrap_span(translation, translation_key)
-    if TranslationCenter::CONFIG['inspector'] == 'all'
+    # put the inspector class if inspector is all and the key doesn't belongs to translation_center
+    if TranslationCenter::CONFIG['inspector'] == 'all' && translation_key.name.split('.').first != 'translation_center'
       "<span class='tc-inspector-key' data-type='#{translation_key.status(I18n.locale)}' data-id='#{translation_key.id}'> #{translation} </span>".html_safe
     else
       translation
@@ -96,9 +97,10 @@ module I18n
         translation_key = keys
         # remove locale
         translation_key.shift
-        translation_key = TranslationCenter::TranslationKey.find_by_name(translation_key.join('.'))
 
-        if TranslationCenter::CONFIG['inspector'] == 'off'
+        translation_key = TranslationCenter::TranslationKey.find_by_name(translation_key.join('.'))
+        # don't put the inspector class if inspector is off or the key belongs to translation_center
+        if TranslationCenter::CONFIG['inspector'] == 'off' || translation_key.name.split('.').first == 'translation_center'
           %(<span class="translation_missing" title="translation missing: #{keys.join('.')}">#{key}</span>)
         else
           %(<span class="translation_missing tc-inspector-key" data-type="#{translation_key.status(I18n.locale)}" data-id="#{translation_key.id}" title="translation missing: #{keys.join('.')}">#{key}</span>)

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/test/dummy/config/locales/ar.yml

@@ -9,6 +9,16 @@ ar:
     errors: 
       messages: 
         taken: محجوز
+  attributes: 
+    email: "البريد الالكترونى"
+    password: "كلمة السر"
+    title: عنوان
+  layouts: 
+    translation_center: 
+      application: 
+        back_to_app: "العودة إلى الموق"
+        to: إلى
+        translate_to: "ترجم إلى"
   posts: 
     index: 
       Content: المحتوى

data/test/dummy/config/locales/de.yml

@@ -1,2 +1,12 @@
 --- 
-de: {}
+de: 
+  layouts: 
+    translation_center: 
+      application: 
+        Translation_Center: "Translation Center 1"
+        from: von
+  posts: 
+    index: 
+      Content: Content2
+      Title: Title
+      testing_new_keys: "new keys"

data/test/dummy/config/locales/en.yml

@@ -3,20 +3,12 @@ en:
   actions: 
     are_you_sure: "Are you sure ?"
   activerecord: 
-    attributes: 
-      post: 
-        content: Content
-        title: Title
-      translation_center/translation_key: 
-        name: Name
-      user: 
-        email: Email
-        password: Password
-        remember_me: "Remember Me"
+    attributes: Attributes
     errors: 
       messages: 
         record_invalid: "Validation failed: %{errors}"
         taken: "has already been taken"
+    models: Models
   attributes: 
     content: Content
     email: Email
@@ -128,6 +120,7 @@ en:
       invalid: "Invalid email or password."
       invalid_token: "Invalid authentication token."
       locked: "Your account is locked."
+      not_found_in_database: "Invalid email or password."
       timeout: "Your session expired, please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your account before continuing."
@@ -169,6 +162,7 @@ en:
       already_confirmed: "was already confirmed, please try signing in"
       blank: "can't be blank"
       confirmation: "doesn't match confirmation"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
       empty: "can't be empty"
       equal_to: "must be equal to %{count}"
       even: "must be even"
@@ -196,6 +190,11 @@ en:
       create: "Create %{model}"
       submit: "Save %{model}"
       update: "Update %{model}"
+    label: 
+      user: 
+        email: Email
+        password: Password
+        remember_me: "Remember Me"
     select: 
       prompt: "Please select"
     submit: 
@@ -211,6 +210,7 @@ en:
         to: To
         translate_to: "Translate To"
   meta_search: 
+    created_at_gteq: "Created At Gteq"
     or: or
     predicates: 
       contains: "%{attribute} contains"
@@ -282,13 +282,13 @@ en:
         delimiter: ""
   post: 
     content: Content
-    title: Title
   posts: 
     index: 
       Content: Content
-      Listing_posts: "Listing Posts"
       Title: Title
       testing_new_keys: "Testing New Keys"
+  search: 
+    created_at_gteq: "Created At Gteq"
   support: 
     array: 
       last_word_connector: ", and "
@@ -318,13 +318,51 @@ en:
         pending: Pending
         translated: Translated
         untranslated: Untranslated
+    center: 
+      activity: 
+        ago: Ago
+        changes: Changes
+        key: Key
+        locale: Locale
+        no_matches: "No Matches"
+        time: Time
+        user: User
+      dashboard: 
+        activity: Activity
+        ago: Ago
+        all: All
+        changes: Changes
+        choose_filter: "Choose Filter"
+        dashboard: Dashboard
+        date: Date
+        filter: Filter
+        filter_by: "Filter By"
+        key: Key
+        language: Language
+        locale: Locale
+        pending: Pending
+        progress: Progress
+        reset: Reset
+        search: Search
+        search_by: "Search By"
+        select_locale: "Select Locale"
+        time: Time
+        to: To
+        translated: Translated
+        untranslated: Untranslated
+        user: User
+    dashboard: Dashboard
+    search_keys: "Search Keys"
     translate_to: "Translate To"
     translation_center: "Translation Center"
     translation_keys: 
+      destroyed_successfully: "Translation key was destroyed successfully"
       show: 
         Add/Edit_Translation: "Add/Edit Translation"
         Add_Translation: "Add Translation"
         Translations: Translations
+        back_to_category: "Back To"
+        destroy: Destroy
         no_translations_available: "No Translations Available"
       show_keys: 
         translated: Translated
@@ -364,6 +402,7 @@ en:
     password: Password
     remember_me: "Remember Me"
     signed_in: "Signed In"
+    unauthenticated: Unauthenticated
   will_paginate: 
     next_label: "Next →"
     page_entries_info: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation_center
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: