From 6d5dd4a80f59c28027a65e15c3150d4573f2ada1 Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Wed, 27 Nov 2013 17:50:33 +0800
Subject: [PATCH] Changed Site Valid Locales to In Use Locales

---
 app/controllers/admin/links_controller.rb     |  2 +-
 app/controllers/admin/pages_controller.rb     |  2 +-
 app/controllers/admin/sites_controller.rb     |  8 +++++
 app/helpers/admin/assets_helper.rb            |  2 +-
 app/helpers/admin/tags_helper.rb              |  2 +-
 app/models/user/user.rb                       |  3 +-
 app/views/admin/ad_images/_form.html.erb      |  4 +--
 .../asset_categories/_asset_category.html.erb |  2 +-
 .../admin/asset_categories/_form.html.erb     |  2 +-
 .../admin/asset_categories/index.html.erb     |  4 +--
 app/views/admin/assets/_asset.html.erb        |  2 +-
 app/views/admin/assets/_form.html.erb         |  4 +--
 app/views/admin/assets/file_upload.html.erb   |  4 +--
 .../attributes/_attribute_field.html.erb      |  2 +-
 app/views/admin/attributes/new.html.erb       |  2 +-
 app/views/admin/categories/_category.html.erb |  2 +-
 app/views/admin/categories/_form.html.erb     |  2 +-
 app/views/admin/categories/_index.html.erb    |  2 +-
 app/views/admin/items/_form_link.html.erb     |  4 +--
 app/views/admin/items/_form_page.html.erb     |  4 +--
 app/views/admin/items/_node.html.erb          |  2 +-
 app/views/admin/items/_site_bar.html.erb      |  4 +--
 app/views/admin/links/_form.html.erb          |  4 +--
 app/views/admin/module_tags/_add.html.erb     |  2 +-
 app/views/admin/page_parts/edit.html.erb      |  6 ++--
 .../personal_plugin_intros/index.html.erb     |  4 +--
 app/views/admin/role_filters/_form.html.erb   |  2 +-
 app/views/admin/role_filters/_index.html.erb  |  2 +-
 .../admin/role_filters/_role_filter.html.erb  |  2 +-
 app/views/admin/roles/add_sub_role.html.erb   |  2 +-
 app/views/admin/roles/edit.html.erb           |  2 +-
 app/views/admin/roles/edit_sub_role.html.erb  |  2 +-
 app/views/admin/roles/new.html.erb            |  2 +-
 app/views/admin/sites/preference.html.erb     | 19 +++++++++--
 app/views/admin/sites/search_engine.html.erb  |  8 ++---
 app/views/admin/sites/site_info.html.erb      | 11 +++----
 app/views/admin/sites/sitemap.html.erb        |  4 +--
 app/views/admin/tags/_form.html.erb           |  2 +-
 app/views/admin/tags/_merge_modal.html.erb    |  2 +-
 .../admin/users_new_interface/_form.html.erb  |  4 +--
 .../_form_user_data.html.erb                  |  4 +--
 .../users_new_interface/_user_basic.html.erb  |  8 ++---
 app/views/basic_infos/_form_page.html.erb     |  8 ++---
 app/views/js/_support_member_form_js.erb      | 32 +++++++++----------
 .../attribute_field/_list_block.html.erb      |  8 ++---
 .../_placeholder_block.html.erb               |  8 ++---
 config/routes.rb                              |  1 +
 .../back_end/bulletins/_form.html.erb         |  4 +--
 .../back_end/bulletins/_form_back.html.erb    |  4 +--
 .../back_end/bulletins/_form_file.html.erb    |  4 +--
 .../back_end/bulletins/_form_link.html.erb    |  2 +-
 .../_archive_file_category.html.erb           |  2 +-
 .../archive_file_categorys/_form.html.erb     |  2 +-
 .../archive_file_categorys/index.html.erb     |  2 +-
 .../back_end/archive_files/_form.html.erb     |  4 +--
 .../archive_files/_form_file.html.erb         |  4 +--
 .../ask_categories/_ask_category.html.erb     |  2 +-
 .../back_end/ask_categories/_form.html.erb    |  2 +-
 .../back_end/ask_categories/index.html.erb    |  2 +-
 .../panel/faq/back_end/qas/_form.html.erb     |  4 +--
 .../faq/back_end/qas/_form_qa_file.html.erb   |  4 +--
 .../faq/back_end/qas/_form_qa_link.html.erb   |  2 +-
 .../gallery/back_end/albums/_form.html.erb    |  4 +--
 .../gallery/back_end/albums/show.html.erb     |  6 ++--
 .../back_end/page_contexts/_form.html.erb     |  4 +--
 .../writing_book_categorys/_form.html.erb     |  2 +-
 .../_quick_edit_qe.html.erb                   |  2 +-
 .../_writing_book_category.html.erb           |  2 +-
 .../writing_book_categorys/index.html.erb     |  2 +-
 .../writing_books/_author_type_qe.html.erb    |  2 +-
 .../back_end/writing_books/_form.html.erb     |  4 +--
 .../writing_books/_form_file.html.erb         |  2 +-
 .../writing_books/_paper_type_qe.html.erb     |  2 +-
 .../desktop/personal_books/_form.html.erb     |  4 +--
 .../personal_books/_form_file.html.erb        |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/writing_books/_form.html.erb       |  4 +--
 .../plugin/writing_books/_form_file.html.erb  |  2 +-
 .../_form.html.erb                            |  2 +-
 .../_quick_edit_qe.html.erb                   |  2 +-
 .../_writing_conference_category.html.erb     |  2 +-
 .../index.html.erb                            |  2 +-
 .../_author_type_qe.html.erb                  |  2 +-
 .../writing_conferences/_form.html.erb        |  4 +--
 .../writing_conferences/_form_file.html.erb   |  2 +-
 .../_paper_type_qe.html.erb                   |  2 +-
 .../desktop/conference_pages/_form.html.erb   |  4 +--
 .../conference_pages/_form_file.html.erb      |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/writing_conferences/_form.html.erb |  4 +--
 .../writing_conferences/_form_file.html.erb   |  2 +-
 .../back_end/diplomas/_form.html.erb          |  4 +--
 .../desktop/personal_diplomas/_form.html.erb  |  4 +--
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/diplomas/_form.html.erb            |  4 +--
 .../_experience_category.html.erb             |  2 +-
 .../experience_categorys/_form.html.erb       |  2 +-
 .../_quick_edit_qe.html.erb                   |  2 +-
 .../experience_categorys/index.html.erb       |  2 +-
 .../experiences/_experience_type_qe.html.erb  |  2 +-
 .../back_end/experiences/_form.html.erb       |  4 +--
 .../personal_experiences/_form.html.erb       |  4 +--
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/experiences/_form.html.erb         |  4 +--
 .../back_end/honors/_honor_type_qe.html.erb   |  2 +-
 .../desktop/personal_honors/_form.html.erb    |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../writing_journal_categorys/_form.html.erb  |  2 +-
 .../_quick_edit_qe.html.erb                   |  2 +-
 .../_writing_journal_category.html.erb        |  2 +-
 .../writing_journal_categorys/index.html.erb  |  2 +-
 .../writing_journals/_author_type_qe.html.erb |  2 +-
 .../back_end/writing_journals/_form.html.erb  |  4 +--
 .../writing_journals/_form_file.html.erb      |  2 +-
 .../writing_journals/_level_type_qe.html.erb  |  2 +-
 .../desktop/journal_pages/_form.html.erb      |  4 +--
 .../desktop/journal_pages/_form_file.html.erb |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/writing_journals/_form.html.erb    |  4 +--
 .../writing_journals/_form_file.html.erb      |  2 +-
 .../personal_lab/back_end/labs/_form.html.erb |  4 +--
 .../back_end/labs/_form_file.html.erb         |  2 +-
 .../desktop/personal_labs/_form.html.erb      |  4 +--
 .../desktop/personal_labs/_form_file.html.erb |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../personal_lab/plugin/labs/_form.html.erb   |  4 +--
 .../plugin/labs/_form_file.html.erb           |  2 +-
 .../writing_patent_categorys/_form.html.erb   |  2 +-
 .../_quick_edit_qe.html.erb                   |  2 +-
 .../_writing_book_category.html.erb           |  2 +-
 .../writing_patent_categorys/index.html.erb   |  2 +-
 .../back_end/writing_patents/_form.html.erb   |  4 +--
 .../writing_patents/_form_file.html.erb       |  2 +-
 .../writing_patents/_patent_type_qe.html.erb  |  2 +-
 .../desktop/personal_patents/_form.html.erb   |  4 +--
 .../personal_patents/_form_file.html.erb      |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/writing_patents/_form.html.erb     |  4 +--
 .../writing_patents/_form_file.html.erb       |  2 +-
 .../back_end/project_categorys/_form.html.erb |  2 +-
 .../_project_category.html.erb                |  2 +-
 .../back_end/project_categorys/index.html.erb |  2 +-
 .../back_end/projects/_form.html.erb          |  4 +--
 .../back_end/projects/_form_file.html.erb     |  2 +-
 .../projects/_project_type_qe.html.erb        |  2 +-
 .../desktop/personal_projects/_form.html.erb  |  4 +--
 .../personal_projects/_form_file.html.erb     |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/projects/_form.html.erb            |  4 +--
 .../plugin/projects/_form_file.html.erb       |  2 +-
 .../back_end/researchs/_form.html.erb         |  4 +--
 .../back_end/researchs/_form_file.html.erb    |  2 +-
 .../desktop/personal_researchs/_form.html.erb |  4 +--
 .../personal_researchs/_form_file.html.erb    |  2 +-
 .../desktop/plugin_intros/_form.html.erb      |  4 +--
 .../plugin/researchs/_form.html.erb           |  4 +--
 .../plugin/researchs/_form_file.html.erb      |  2 +-
 .../survey/back_end/surveys/_form.html.erb    |  8 ++---
 .../surveys/_form_survey_question.html.erb    |  2 +-
 .../_form_survey_question_option.html.erb     |  2 +-
 .../_form_survey_question_radiogroup.html.erb |  2 +-
 .../web_link_categorys/_form.html.erb         |  2 +-
 .../_web_link_category.html.erb               |  2 +-
 .../web_link_categorys/index.html.erb         |  4 +--
 .../back_end/web_links/_form.html.erb         |  4 +--
 165 files changed, 289 insertions(+), 267 deletions(-)

diff --git a/app/controllers/admin/links_controller.rb b/app/controllers/admin/links_controller.rb
index 63744182..ad146fc5 100644
--- a/app/controllers/admin/links_controller.rb
+++ b/app/controllers/admin/links_controller.rb
@@ -37,7 +37,7 @@ class Admin::LinksController < Admin::ItemsController
       link = Link.find(params[:id])
       m = {}
       m["public"] = link.is_published ? 1 : 0
-      m["link"] = @site_valid_locales.inject([]) do |result, locale|
+      m["link"] = @site_in_use_locales.inject([]) do |result, locale|
         result << [locale, (link.enabled_for && link.enabled_for.include?(locale)) ? 1 : 0, (link.menu_enabled_for && link.menu_enabled_for[locale].eql?("true")) ? 1 :0]
       end
       render json: JSON.pretty_generate(m)
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index ef16c878..7f3ecde4 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -73,7 +73,7 @@ class Admin::PagesController < Admin::ItemsController
       m["category"] = page.category.present? ? page.category.map{|c| c.to_s} : []
       m["tags"] = page.tag.present? ? page.tag.map{|c| c.to_s} : []
       m["public"] = page.is_published ? 1 : 0
-      m["link"] = @site_valid_locales.inject([]) do |link, locale|
+      m["link"] = @site_in_use_locales.inject([]) do |link, locale|
         link << [locale, (page.enabled_for && page.enabled_for.include?(locale)) ? 1 : 0, (page.menu_enabled_for && page.menu_enabled_for[locale].eql?('true')) ? 1 :0]
       end
       m["count"] = page.frontend_data_count 
diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb
index 96088f42..50d399a9 100644
--- a/app/controllers/admin/sites_controller.rb
+++ b/app/controllers/admin/sites_controller.rb
@@ -21,6 +21,7 @@ class Admin::SitesController < OrbitBackendController
   end
 
   def update
+    params[:site][:defalut_locale] = "zh_tw" if params[:site][:default_locale].blank?
     @site.update_attributes(params[:site])
     redirect_to :back
   end
@@ -71,6 +72,13 @@ class Admin::SitesController < OrbitBackendController
     
   end
 
+  def reset_default_locale
+    @site.defalut_locale = params[:default_locale]
+    if @site.save
+      render :nothing => true
+    end
+  end
+
   def change_design
     design = Design.find(params[:site_id]) rescue nil
     update_design(design) if design
diff --git a/app/helpers/admin/assets_helper.rb b/app/helpers/admin/assets_helper.rb
index 9a2fd0a3..acc65c11 100644
--- a/app/helpers/admin/assets_helper.rb
+++ b/app/helpers/admin/assets_helper.rb
@@ -2,7 +2,7 @@ module Admin::AssetsHelper
 
   def show_all_fields(asset, field)
     a = []
-    @site_valid_locales.each do |locale|
+    @site_in_use_locales.each do |locale|
       a << asset.send("#{field}_translations")[locale] rescue nil
     end 
     a.join(' - ')
diff --git a/app/helpers/admin/tags_helper.rb b/app/helpers/admin/tags_helper.rb
index a9c48c3a..4d195e63 100644
--- a/app/helpers/admin/tags_helper.rb
+++ b/app/helpers/admin/tags_helper.rb
@@ -6,7 +6,7 @@ module Admin::TagsHelper
   end
 
   def show_names_slash(tag)
-    span_names = @site_valid_locales.inject([]) do |names, locale|
+    span_names = @site_in_use_locales.inject([]) do |names, locale|
       names << content_tag(:span, tag.name_translations[locale], class: "tag")
     end
     span_names.join(" / ").html_safe
diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 2bfc4eeb..88760a32 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -59,7 +59,8 @@ class User
 
   validates :user_id,
             :presence => { :message => I18n.t("users.user_id_not_null") } , 
-            :length => {:minimum => 3, :maximum => 50, :message => I18n.t("users.user_id_length") }
+            :length => {:minimum => 3, :maximum => 50, :message => I18n.t("users.user_id_length") },
+            :uniqueness => true
             
   def email_required?
     false
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index 71d6dbf4..1ddecf8b 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -166,7 +166,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -176,7 +176,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/app/views/admin/asset_categories/_asset_category.html.erb b/app/views/admin/asset_categories/_asset_category.html.erb
index c384ebe3..c45696d9 100644
--- a/app/views/admin/asset_categories/_asset_category.html.erb
+++ b/app/views/admin/asset_categories/_asset_category.html.erb
@@ -11,7 +11,7 @@
 				</ul>
 			</div>
 		</td>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= asset_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 	</tr>
diff --git a/app/views/admin/asset_categories/_form.html.erb b/app/views/admin/asset_categories/_form.html.erb
index 12a4693b..81c8973f 100644
--- a/app/views/admin/asset_categories/_form.html.erb
+++ b/app/views/admin/asset_categories/_form.html.erb
@@ -11,7 +11,7 @@
 	
 	<div id="widget-title">
 		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/app/views/admin/asset_categories/index.html.erb b/app/views/admin/asset_categories/index.html.erb
index 0ca08b7b..9725a43e 100644
--- a/app/views/admin/asset_categories/index.html.erb
+++ b/app/views/admin/asset_categories/index.html.erb
@@ -8,7 +8,7 @@
 				<thead>
 					<tr>
 						<th class="span2"><%= t(:key) %></th>
-						<% @site_valid_locales.each do |locale| %>
+						<% @site_in_use_locales.each do |locale| %>
 						<th class="span2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 						<% end %>
 					</tr>
@@ -23,7 +23,7 @@
 	<thead>
 		<tr>
 			<th class="span2"></th>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span2"></th>
 			<% end %>
 		</tr>
diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb
index b7c30fe9..fd76be26 100644
--- a/app/views/admin/assets/_asset.html.erb
+++ b/app/views/admin/assets/_asset.html.erb
@@ -2,7 +2,7 @@
 	<td>
 		<%= check_box_tag 'files[]', asset.id, false, :class => "checkbox_in_list" %>
 		<input type="hidden" value="<%= asset.data.url %>" id="url_<%= asset.id %>" />
-		<% @site_valid_locales.each_with_index do |locale, i| %>
+		<% @site_in_use_locales.each_with_index do |locale, i| %>
 			<input type="hidden" value="<%= asset.description_translations[locale] rescue nil %>" id="<%= locale %>_desc_<%= asset.id %>" />
 			<input type="hidden" value="<%= asset.title_translations[locale] rescue nil %>" id="<%= locale %>_title_<%= asset.id %>" />
 		<% end %>
diff --git a/app/views/admin/assets/_form.html.erb b/app/views/admin/assets/_form.html.erb
index 1e080678..830b8e19 100644
--- a/app/views/admin/assets/_form.html.erb
+++ b/app/views/admin/assets/_form.html.erb
@@ -1,10 +1,10 @@
 <div class="control-group">
     <ul class="nav nav-pills language-nav">
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
             <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
     </ul>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
             <div class="control-group input-title">
                 <%= f.label :title , t('asset.title'), :class=>"control-label muted" %>
diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb
index ddb0c1b0..bded6944 100644
--- a/app/views/admin/assets/file_upload.html.erb
+++ b/app/views/admin/assets/file_upload.html.erb
@@ -16,7 +16,7 @@
             <div class="controls">
                 <%= f.fields_for :title_translations do |f| %>
                     <div>
-                    <% @site_valid_locales.each do |locale| %>
+                    <% @site_in_use_locales.each do |locale| %>
                         <%= content_tag :label do -%>
                             <div>
                                 <%= I18nVariable.from_locale(locale) %>
@@ -33,7 +33,7 @@
             <div class="controls">
                 <%= f.fields_for :description_translations do |f| %>
                     <div>
-                    <% @site_valid_locales.each do |locale| %>
+                    <% @site_in_use_locales.each do |locale| %>
                         <%= content_tag :label do -%>
                             <div>
                                 <%= I18nVariable.from_locale(locale) %>
diff --git a/app/views/admin/attributes/_attribute_field.html.erb b/app/views/admin/attributes/_attribute_field.html.erb
index 15e0d0e7..23f8f6e8 100644
--- a/app/views/admin/attributes/_attribute_field.html.erb
+++ b/app/views/admin/attributes/_attribute_field.html.erb
@@ -4,7 +4,7 @@
     <%= f.check_box :locale %>
   </td>
 	<%= f.fields_for :title_translations do |f| %>
-	  <% @site_valid_locales.each do |locale| %>
+	  <% @site_in_use_locales.each do |locale| %>
 	    <td><%= f.text_field locale, :style => "width:130px", :value => (attribute_field.title_translations[locale] rescue nil) %></td>
 	  <% end %>
 	<% end %>
diff --git a/app/views/admin/attributes/new.html.erb b/app/views/admin/attributes/new.html.erb
index 404a2db5..2ecf57a7 100644
--- a/app/views/admin/attributes/new.html.erb
+++ b/app/views/admin/attributes/new.html.erb
@@ -30,7 +30,7 @@
                                 </div>
                             </div>
 
-                            <% @site_valid_locales.each_with_index do |locale, i| %>
+                            <% @site_in_use_locales.each_with_index do |locale, i| %>
 
                             <label class="muted" for="name-en"><%= t(:item_name) %>(<%= I18nVariable.from_locale(locale) %>)</label>
                             <input id="name-<%= locale %>" type="text" class="input-large" placeholder="<%= t(:item_name) %>" name="<%="#{@attribute_type}[title_translations][#{locale}]"%>">
diff --git a/app/views/admin/categories/_category.html.erb b/app/views/admin/categories/_category.html.erb
index bab1a194..fca22a5d 100644
--- a/app/views/admin/categories/_category.html.erb
+++ b/app/views/admin/categories/_category.html.erb
@@ -1,5 +1,5 @@
 <tr class="<%= 'disable' if category.disable %>">
-  <% @site_valid_locales.each_with_index do |locale, i| %>
+  <% @site_in_use_locales.each_with_index do |locale, i| %>
 		<td>
 			<%= category.title_translations[locale] %>
 			<% if i == 0 %>
diff --git a/app/views/admin/categories/_form.html.erb b/app/views/admin/categories/_form.html.erb
index b741a24f..510f8de3 100644
--- a/app/views/admin/categories/_form.html.erb
+++ b/app/views/admin/categories/_form.html.erb
@@ -2,7 +2,7 @@
 <%= f.error_messages %>
 
 <%= f.fields_for :title_translations do |f| %>
-  <% @site_valid_locales.each do |locale| %>
+  <% @site_in_use_locales.each do |locale| %>
 		<%= label_tag "name-#{locale}", "#{t(:name)} (#{I18nVariable.from_locale(locale)})" %>
 		<%= f.text_field locale, :class => 'input-large', :value => (@category.title_translations[locale] rescue ''), placeholder: t(:name), id: locale %>
   <% end %>
diff --git a/app/views/admin/categories/_index.html.erb b/app/views/admin/categories/_index.html.erb
index efd77dc8..6687692d 100644
--- a/app/views/admin/categories/_index.html.erb
+++ b/app/views/admin/categories/_index.html.erb
@@ -1,7 +1,7 @@
 <table class="table main-list">
   <thead>
     <tr class="sort-header">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <th class="<%= 'span50-percent' if i==0 %>"><a href="#"><%= t(:_locale, :locale => locale) %></a></th>
       <% end %>
     </tr>
diff --git a/app/views/admin/items/_form_link.html.erb b/app/views/admin/items/_form_link.html.erb
index 57069624..2d3c546c 100644
--- a/app/views/admin/items/_form_link.html.erb
+++ b/app/views/admin/items/_form_link.html.erb
@@ -7,7 +7,7 @@
       <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name), id: 'name' %>
       <span class="help-block"><%= t("front_page.name_field_helper") %></span>
 
-      <% @site_valid_locales.each do |locale| %>
+      <% @site_in_use_locales.each do |locale| %>
         <%= f.fields_for :title_translations do |f| %>
           <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}" %>
           <%= f.text_field locale, class: 'input-xlarge', placeholder: "#{t(:title)} #{I18nVariable.from_locale(locale)}", id: locale %>
@@ -31,7 +31,7 @@
 
       <div class="link-options checkbox-groups hide">
         <label><%= t(:activation_link) %></label>
-        <% @site_valid_locales.each do |valid_locale| %>
+        <% @site_in_use_locales.each do |valid_locale| %>
           <div class="active-link <%= valid_locale %>">
             <label class="checkbox">
               <%= check_box_tag 'link[enabled_for][]', valid_locale, false, class: "lang-enable" %> <%= I18nVariable.from_locale(valid_locale) %>
diff --git a/app/views/admin/items/_form_page.html.erb b/app/views/admin/items/_form_page.html.erb
index 8789ba88..b3dcc371 100644
--- a/app/views/admin/items/_form_page.html.erb
+++ b/app/views/admin/items/_form_page.html.erb
@@ -8,7 +8,7 @@
       <span class="help-block"><%= t("front_page.name_field_helper") %></span>
 
       <%= f.fields_for :title_translations do |f| %>
-        <% @site_valid_locales.each do |locale| %>
+        <% @site_in_use_locales.each do |locale| %>
           <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}" %>
           <%= f.text_field locale, class: 'input-xlarge', placeholder: "#{t(:title)} #{I18nVariable.from_locale(locale)}", id: locale %>
         <% end %>
@@ -67,7 +67,7 @@
 
       <div class="link-options checkbox-groups hide">
         <label><%= t(:activation_link) %></label>
-        <% @site_valid_locales.each do |valid_locale| %>
+        <% @site_in_use_locales.each do |valid_locale| %>
           <div class="active-link <%= valid_locale %>">
             <label class="checkbox">
               <%= check_box_tag 'page[enabled_for][]', valid_locale, false, class: "lang-enable" %> <%= I18nVariable.from_locale(valid_locale) %>
diff --git a/app/views/admin/items/_node.html.erb b/app/views/admin/items/_node.html.erb
index 808e70f9..5ef6910f 100644
--- a/app/views/admin/items/_node.html.erb
+++ b/app/views/admin/items/_node.html.erb
@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="item-info pull-right">
-      <% @site_valid_locales.each do |valid_locale| %>
+      <% @site_in_use_locales.each do |valid_locale| %>
         <% if node.enabled_for && node.enabled_for.include?(valid_locale) %>
           <span class="label label-warning"><%= I18nVariable.from_locale(valid_locale) %></span>
           ｜
diff --git a/app/views/admin/items/_site_bar.html.erb b/app/views/admin/items/_site_bar.html.erb
index eeaa8a07..85f71f59 100644
--- a/app/views/admin/items/_site_bar.html.erb
+++ b/app/views/admin/items/_site_bar.html.erb
@@ -14,9 +14,9 @@
 
 				<li title="Site Info"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
 
-				<li title="Site Mobile"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive') do %><span><i class="icons-mobile"></i></span><%end%></li>
+				<li title="Site Mobile"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
 
-				<li title="Search Engine"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-search"></i></span><%end%></li>
+				<li title="Search Engine"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>
 
 				<li title="Preference"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
 
diff --git a/app/views/admin/links/_form.html.erb b/app/views/admin/links/_form.html.erb
index 8a2390ff..10adf3ea 100644
--- a/app/views/admin/links/_form.html.erb
+++ b/app/views/admin/links/_form.html.erb
@@ -10,7 +10,7 @@
 <%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %>
 
 <%= f.fields_for :title_translations do |f| %>
-  <% @site_valid_locales.each do |locale| %>
+  <% @site_in_use_locales.each do |locale| %>
     <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}" %>
     <%= f.text_field locale, class: 'input-xlarge', placeholder: "#{t(:title)} #{I18nVariable.from_locale(locale)}", value: (@item.title_translations[locale] rescue nil) %>
   <% end %>
@@ -30,7 +30,7 @@
 
 <%= f.label :menu_enabled_for, "#{t('front_page.menu_enable_lang')}:" %>
 <p>
-  <% @site_valid_locales.each do |valid_locale| %>
+  <% @site_in_use_locales.each do |valid_locale| %>
     <label class="checkbox inline">
       <%= check_box_tag 'link[menu_enabled_for][]', valid_locale, (@item.menu_enabled_for.nil? ? true : @item.menu_enabled_for.include?(valid_locale)) %>
       <%= I18nVariable.from_locale(valid_locale) %>
diff --git a/app/views/admin/module_tags/_add.html.erb b/app/views/admin/module_tags/_add.html.erb
index 4e9bb1d8..f8619d64 100644
--- a/app/views/admin/module_tags/_add.html.erb
+++ b/app/views/admin/module_tags/_add.html.erb
@@ -1,6 +1,6 @@
 <%= form_for :tag, :url => admin_module_tags_path, :remote => true, :html => {:id => 'tag_form'} do |f| %>
   <%= f.fields_for :name_translations do |f| %>
-  	<% @site_valid_locales.each do |locale| %>
+  	<% @site_in_use_locales.each do |locale| %>
   	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
   	<% end %>
   <% end %>
diff --git a/app/views/admin/page_parts/edit.html.erb b/app/views/admin/page_parts/edit.html.erb
index d99ece03..f60a00c4 100644
--- a/app/views/admin/page_parts/edit.html.erb
+++ b/app/views/admin/page_parts/edit.html.erb
@@ -31,14 +31,14 @@
           <strong><%= t(:language) %></strong>
         </div>
         <ul class="nav nav-pills language-nav">
-          <% @site_valid_locales.each_with_index do |locale, i| %>
+          <% @site_in_use_locales.each_with_index do |locale, i| %>
             <li class="<%= 'active' if i == 0 %>">
               <a href=".<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
             </li>
           <% end %>
         </ul>
         <div class="tab-content language-area">
-          <% @site_valid_locales.each_with_index do |locale, i| %>
+          <% @site_in_use_locales.each_with_index do |locale, i| %>
             <div class="tab-pane fade <%= locale %> <%= 'active in' if i == 0 %>">
               <div class="control-group input-content">
                 <label class="control-label muted"><%= t(:content) %></label>
@@ -76,7 +76,7 @@
       </div>
       <div id="module_widget" class="tab-pane fade in">
         <%= f.fields_for :title_translations do |f| %>
-          <% @site_valid_locales.each do |locale| %>
+          <% @site_in_use_locales.each do |locale| %>
             <div class="control-group input-content">
               <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}", class: "control-label muted" %>
               <div class="controls">
diff --git a/app/views/admin/personal_plugin_intros/index.html.erb b/app/views/admin/personal_plugin_intros/index.html.erb
index 3c399fd5..dd39603c 100644
--- a/app/views/admin/personal_plugin_intros/index.html.erb
+++ b/app/views/admin/personal_plugin_intros/index.html.erb
@@ -65,7 +65,7 @@
       <!-- Language Tabs -->
       <div class="nav-name"><strong><%= t(:language) %></strong></div>
       <ul class="nav nav-pills language-nav">
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li class="<%= 'active' if i == 0 %>">
             <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
           </li>
@@ -75,7 +75,7 @@
       <!-- Language -->
       <div class="tab-content language-area">
 
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
         
           <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/app/views/admin/role_filters/_form.html.erb b/app/views/admin/role_filters/_form.html.erb
index 6c14f1aa..719023da 100644
--- a/app/views/admin/role_filters/_form.html.erb
+++ b/app/views/admin/role_filters/_form.html.erb
@@ -6,7 +6,7 @@
 <%= f.text_field :key, :class=>"input-large" %>
 
 <%= f.fields_for :title_translations do |f| %>
-  <% @site_valid_locales.each do |locale| %>
+  <% @site_in_use_locales.each do |locale| %>
 		<%= label_tag "name-#{locale}", "#{t(:name)} (#{I18nVariable.from_locale(locale)})" %>
 		<%= f.text_field locale, :class => 'input-large', :value => (@role_filter.title_translations[locale] rescue ''), placeholder: t(:name) %>
   <% end %>
diff --git a/app/views/admin/role_filters/_index.html.erb b/app/views/admin/role_filters/_index.html.erb
index 0063775f..fd781525 100644
--- a/app/views/admin/role_filters/_index.html.erb
+++ b/app/views/admin/role_filters/_index.html.erb
@@ -2,7 +2,7 @@
   <thead>
     <tr class="sort-header">
       <th class="span3 active"><a href="#">Key<b class="icons-arrow-down-4"></b></a></th>
-      <% @site_valid_locales.each do |locale| %>
+      <% @site_in_use_locales.each do |locale| %>
       <th><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
       <% end %>
       <th class="span1"></th>
diff --git a/app/views/admin/role_filters/_role_filter.html.erb b/app/views/admin/role_filters/_role_filter.html.erb
index a2a9d733..47fe438a 100644
--- a/app/views/admin/role_filters/_role_filter.html.erb
+++ b/app/views/admin/role_filters/_role_filter.html.erb
@@ -2,7 +2,7 @@
 <tr id="<%= dom_id role_filter %>" class="<%= role_filter.disable ? 'disable' : ''  %>">
   <td><span class="label label-info"><%= role_filter.key %></span></td>
   <% if @types.is_localized?(:title) %>
-  <% @site_valid_locales.each_with_index do |locale, i| %>
+  <% @site_in_use_locales.each_with_index do |locale, i| %>
   <td>
     <%= role_filter.title_translations[locale] rescue nil %>
     <% if i == 0 %>
diff --git a/app/views/admin/roles/add_sub_role.html.erb b/app/views/admin/roles/add_sub_role.html.erb
index 305281c1..3f7f111f 100644
--- a/app/views/admin/roles/add_sub_role.html.erb
+++ b/app/views/admin/roles/add_sub_role.html.erb
@@ -8,7 +8,7 @@
           <div><%= @sub_attribute.key%></div>
       <% end %>
 
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
 
       <label class="muted" for="name-en"><%= t(:item_name) %>(<%= I18nVariable.from_locale(locale) %>)</label>
       <input id="name-<%= locale %>" type="text" class="input-large" placeholder="<%= t(:item_name) %>" name="<%="sub_role[title_translations][#{locale}]"%>">
diff --git a/app/views/admin/roles/edit.html.erb b/app/views/admin/roles/edit.html.erb
index ece8ccc8..93211673 100644
--- a/app/views/admin/roles/edit.html.erb
+++ b/app/views/admin/roles/edit.html.erb
@@ -8,7 +8,7 @@
         <div><%= @attribute.key%></div>
     <% end %>
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
 
     <label class="muted" for="name-en"><%= t(:item_name) %>(<%= I18nVariable.from_locale(locale) %>)</label>
     <input id="name-<%= locale %>" type="text" class="input-large" placeholder="<%= t(:item_name) %>" name="<%="#{@attribute_type}[title_translations][#{locale}]"%>" value="<%= @attribute.title_translations[locale] rescue nil %>">
diff --git a/app/views/admin/roles/edit_sub_role.html.erb b/app/views/admin/roles/edit_sub_role.html.erb
index 1ac50570..7700f6a9 100644
--- a/app/views/admin/roles/edit_sub_role.html.erb
+++ b/app/views/admin/roles/edit_sub_role.html.erb
@@ -8,7 +8,7 @@
         <div><%= @sub_attribute.key%></div>
     <% end %>
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
 
     <label class="muted" for="name-en"><%= t(:item_name) %>(<%= I18nVariable.from_locale(locale) %>)</label>
     <input id="name-<%= locale %>" type="text" class="input-large" placeholder="<%= t(:item_name) %>" name="<%="sub_role[title_translations][#{locale}]"%>" value="<%= @sub_attribute.title_translations[locale] rescue nil %>">
diff --git a/app/views/admin/roles/new.html.erb b/app/views/admin/roles/new.html.erb
index 6d48013f..e50684ce 100644
--- a/app/views/admin/roles/new.html.erb
+++ b/app/views/admin/roles/new.html.erb
@@ -9,7 +9,7 @@
           <div><%= @attribute.key%></div>
       <% end %>
 
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
 
       <label class="muted" for="name-en"><%= t(:item_name) %>(<%= I18nVariable.from_locale(locale) %>)</label>
       <input id="name-<%= locale %>" type="text" class="input-large" placeholder="<%= t(:item_name) %>" name="<%="#{@attribute_type}[title_translations][#{locale}]"%>">
diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb
index fd4b8525..45d5c37b 100644
--- a/app/views/admin/sites/preference.html.erb
+++ b/app/views/admin/sites/preference.html.erb
@@ -146,14 +146,14 @@
                     <label class="control-label muted">Enable User Language Detection
                     </label>
                     <div class="controls">
-                      <%= f.check_box :enable_language_detection, :class => "toggle-check", data: {disabled: true} %> 
+                      <%= f.check_box :enable_language_detection, :class => "toggle-check reset_default_locale", data: {disabled: true} %> 
                     </div>
                   </div>
 
                   <div class="control-group">
                     <label class="control-label muted">Enable Language</label>
                     <div class="controls">
-                     <% @site_valid_locales.each do |valid_locale| %>
+                     <% @site_in_use_locales.each do |valid_locale| %>
                       <%= check_box_tag "site[in_use_locales][]", valid_locale, @site.in_use_locales.include?(valid_locale), :class=>"toggle-check in_use_locales", :data => { :title => "#{I18nVariable.from_locale(valid_locale)}", disabled: true }, "data-deploy"=>"inline" %>
 					            <% end %>
                     </div>
@@ -258,4 +258,17 @@ var locales = <%= @site.in_use_locales.to_json.html_safe %>;
     })
   })
 delete locales;
-</script>
\ No newline at end of file
+</script>
+<% content_for :page_specific_javascript do %>
+  <script>
+    $(document).ready(function(){
+      $(document).on('change', '.reset_default_locale', function(){
+        var control_group = $(this).closest(".control-group").parent().find(".control-group:eq(2)");
+        if ( $(this).is(":checked") ){
+          control_group.find(".togglebox").addClass("disabled");
+          control_group.find("input[type=radio]").removeAttr("checked"); 
+        }
+      }); 
+    }); 
+  </script>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/sites/search_engine.html.erb b/app/views/admin/sites/search_engine.html.erb
index 5a8f6261..e7e79a95 100644
--- a/app/views/admin/sites/search_engine.html.erb
+++ b/app/views/admin/sites/search_engine.html.erb
@@ -49,11 +49,11 @@
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
               </div>
-              <% @site_valid_locales.each_with_index do |locale, i| %>
+              <% @site_in_use_locales.each_with_index do |locale, i| %>
                  <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
                   <%= f.fields_for :keywords do |f| %>
                     <%= f.text_area locale, :class=>'resizable', :value => (@site.keywords(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
@@ -69,11 +69,11 @@
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
               </div>
-              <% @site_valid_locales.each_with_index do |locale, i| %>
+              <% @site_in_use_locales.each_with_index do |locale, i| %>
                  <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
                   <%= f.fields_for :description do |f| %>
                     <%= f.text_area locale, :class=>'resizable', :value => (@site.description(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 0e5ef848..588fdcaa 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -23,8 +23,7 @@
               <!-- Language Tabs -->
               <div class="nav-name"><strong>Language</strong></div>
               <ul class="nav nav-pills language-nav">
-                <% @site_valid_locales.each do |locale|%>
-                <%#= raise @site_valid_locales.inspect %>
+                <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
                 <% end %>
               </ul>
@@ -32,7 +31,7 @@
               <!-- Language -->
               <div class="tab-content language-area">
 
-                 <% @site_valid_locales.each do |locale|%>
+                 <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
                   <div class="control-group input-title">
                     <label class="control-label muted"><%= t 'site.title' %></label>
@@ -56,7 +55,7 @@
 
                   <hr>
                   <!-- CKeditor Site Header -->
-                  <% @site_valid_locales.each do |locale|%>
+                  <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
                     <label class="control-label muted"><%= t('site.header')%></label>
                     <div class="controls">
@@ -81,7 +80,7 @@
                    <hr>
 
                 <!-- CKeditor Site Footer -->
-                  <% @site_valid_locales.each do |locale|%>
+                  <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
                     <label class="control-label muted"><%= t('site.footer')%></label>
                     <div class="controls">
@@ -105,7 +104,7 @@
                   </div>
 
                   <!-- CKeditor Site Footer -->
-                  <% @site_valid_locales.each do |locale|%>
+                  <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
                     <label class="control-label muted"><%= t('site.default_terms_of_use')%></label>
                     <div class="controls">
diff --git a/app/views/admin/sites/sitemap.html.erb b/app/views/admin/sites/sitemap.html.erb
index 499f707f..575913c7 100644
--- a/app/views/admin/sites/sitemap.html.erb
+++ b/app/views/admin/sites/sitemap.html.erb
@@ -14,7 +14,7 @@
 <% end %>
         <div id="sitemap">
            <ul id="map-tree-language" class="nav nav-pills">
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <li <%= ( i == 0 ) ? "class=active" : '' %>>
                <a data-toggle="tab" href="#<%= locale %>">
                 <%= I18nVariable.from_locale(locale) %>
@@ -25,7 +25,7 @@
 
           <div class="tab-content map-tree-content">
           <div class="line"></div>
-          <% @site_valid_locales.each_with_index do |temp_locale, i| %>
+          <% @site_in_use_locales.each_with_index do |temp_locale, i| %>
            <ul id="<%= temp_locale %>" class="map-tree tab-pane fade in <%= ( i == 0 ) ? "in active" : '' %>">
             <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %>
            </ul>
diff --git a/app/views/admin/tags/_form.html.erb b/app/views/admin/tags/_form.html.erb
index 776770e0..252ab1c7 100644
--- a/app/views/admin/tags/_form.html.erb
+++ b/app/views/admin/tags/_form.html.erb
@@ -2,7 +2,7 @@
 <%= f.error_messages %>
 
 <%= f.fields_for :name_translations do |f| %>
-  <% @site_valid_locales.each do |locale| %>
+  <% @site_in_use_locales.each do |locale| %>
     <%= f.label :locale, "#{t(:name)} #{I18nVariable.from_locale(locale)}" %>
     <%= f.text_field locale, class: 'input-large', placeholder: "#{t(:name)} #{I18nVariable.from_locale(locale)}", value: (@tag.name_translations[locale] rescue nil), id: locale %>
   <% end %>
diff --git a/app/views/admin/tags/_merge_modal.html.erb b/app/views/admin/tags/_merge_modal.html.erb
index 9b09a9f5..6b6c8683 100644
--- a/app/views/admin/tags/_merge_modal.html.erb
+++ b/app/views/admin/tags/_merge_modal.html.erb
@@ -7,7 +7,7 @@
       </div>
       <div class="modal-body tags">
         <div class="clearfix">
-          <% @site_valid_locales.each do |locale| %>
+          <% @site_in_use_locales.each do |locale| %>
             <%= label_tag :locale, I18nVariable.from_locale(locale) %>
             <%= text_field_tag "name[#{locale}]", nil, class: 'new-tags-name', placeholder: t('tag.new_name') %>
           <% end %>
diff --git a/app/views/admin/users_new_interface/_form.html.erb b/app/views/admin/users_new_interface/_form.html.erb
index bbe5d96e..aa5735b9 100644
--- a/app/views/admin/users_new_interface/_form.html.erb
+++ b/app/views/admin/users_new_interface/_form.html.erb
@@ -27,7 +27,7 @@
     <div class="tab-content">
 
       <% VALID_LOCALES.collect do |locale| %>
-        <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+        <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
 
       <div class="tab-pane fade <%= active %> in" id="${roleType+'_text_language_<%= locale %>_'+appendIndex}">
         <input type="text" name="${'user[<%= @fname %>]['+nameNumber+'][value][][<%= locale %>]'}" placeholder="<%= I18nVariable.from_locale(locale) %>" value="">
@@ -38,7 +38,7 @@
     </div>
     <div class="btn-group" data-toggle="buttons-radio">
       <% VALID_LOCALES.collect do |locale| %>
-        <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+        <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
       <a class="btn <%= active %>" href="${'#'+roleType+'_text_language_<%= locale %>_'+appendIndex}" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
       <% end %>
       <a href="#" class="btn remove-input"><i class="icon-trash"></i></a>
diff --git a/app/views/admin/users_new_interface/_form_user_data.html.erb b/app/views/admin/users_new_interface/_form_user_data.html.erb
index ecbf6df7..01b87f92 100644
--- a/app/views/admin/users_new_interface/_form_user_data.html.erb
+++ b/app/views/admin/users_new_interface/_form_user_data.html.erb
@@ -27,7 +27,7 @@
     <div class="tab-content">
 
       <% VALID_LOCALES.collect do |locale| %>
-        <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+        <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
 
       <div class="tab-pane fade <%= active %> in" id="${roleType+'_text_language_<%= locale %>_'+appendIndex}">
         <input type="text" name="${'user[<%= @fname %>]['+nameNumber+'][value][][<%= locale %>]'}" placeholder="<%= I18nVariable.from_locale(locale) %>" value="">
@@ -38,7 +38,7 @@
     </div>
     <div class="btn-group" data-toggle="buttons-radio">
       <% VALID_LOCALES.collect do |locale| %>
-        <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+        <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
       <a class="btn <%= active %>" href="${'#'+roleType+'_text_language_<%= locale %>_'+appendIndex}" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
       <% end %>
       <a href="#" class="btn remove-input"><i class="icon-trash"></i></a>
diff --git a/app/views/admin/users_new_interface/_user_basic.html.erb b/app/views/admin/users_new_interface/_user_basic.html.erb
index 15e41664..51624c64 100644
--- a/app/views/admin/users_new_interface/_user_basic.html.erb
+++ b/app/views/admin/users_new_interface/_user_basic.html.erb
@@ -42,7 +42,7 @@
           <div class="add-target">
             <div class="input-append">
               <div class="tab-content">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                 <div class="tab-pane fade <%= ( i == 0 ) ? "active in" : '' %>" id="first_name_<%= locale %>">
                     <%= f.fields_for :first_name_translations do |f| %>
                       <%= f.text_field locale, :value => (@user.first_name_translations[locale] rescue nil), :placeholder=>"#{t("users.first_name")}" %>
@@ -51,7 +51,7 @@
                 <% end %>
               </div>
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#first_name_<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
                 <a href="#" class="btn remove-input"><i class="icon-trash"></i></a>
@@ -68,7 +68,7 @@
           <div class="add-target">
             <div class="input-append">
               <div class="tab-content">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                 <div class="tab-pane fade <%= ( i == 0 ) ? "active in" : '' %>" id="last_name_<%= locale %>">
                     <%= f.fields_for :last_name_translations do |f| %>
                       <%= f.text_field locale, :value => (@user.last_name_translations[locale] rescue nil), :placeholder=>"#{t("users.last_name")}" %>
@@ -77,7 +77,7 @@
                 <% end %>
               </div>
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#last_name_<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
                 <a href="#" class="btn remove-input"><i class="icon-trash"></i></a>
diff --git a/app/views/basic_infos/_form_page.html.erb b/app/views/basic_infos/_form_page.html.erb
index ca4d1514..5eb8fe88 100644
--- a/app/views/basic_infos/_form_page.html.erb
+++ b/app/views/basic_infos/_form_page.html.erb
@@ -39,7 +39,7 @@
           <div class="add-target">
             <div class="input-append">
               <div class="tab-content">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                 <div class="tab-pane fade <%= ( i == 0 ) ? "active in" : '' %>" id="first_name_<%= locale %>">
                     <%= f.fields_for :first_name_translations do |f| %>
                       <%= f.text_field locale, :value => (@user.first_name_translations[locale] rescue nil), :placeholder=>"#{t("users.first_name")}" %>
@@ -48,7 +48,7 @@
                 <% end %>
               </div>
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#first_name_<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
                 
@@ -65,7 +65,7 @@
           <div class="add-target">
             <div class="input-append">
               <div class="tab-content">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                 <div class="tab-pane fade <%= ( i == 0 ) ? "active in" : '' %>" id="last_name_<%= locale %>">
                     <%= f.fields_for :last_name_translations do |f| %>
                       <%= f.text_field locale, :value => (@user.last_name_translations[locale] rescue nil), :placeholder=>"#{t("users.last_name")}" %>
@@ -74,7 +74,7 @@
                 <% end %>
               </div>
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#last_name_<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
                
diff --git a/app/views/js/_support_member_form_js.erb b/app/views/js/_support_member_form_js.erb
index dd72f830..549a63e6 100644
--- a/app/views/js/_support_member_form_js.erb
+++ b/app/views/js/_support_member_form_js.erb
@@ -21,16 +21,16 @@
         <div class="controls">
           <div class="input-append">
             <div class="tab-content">
-            <% @site_valid_locales.each do |locale| %>
-              <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
               <div class="tab-pane <%= active %> fade in" id="${_title_translations[0]+'_<%= locale%>'}">
                 <input type="text" data-type="lang_<%= locale%>" name="${_title_translations[1]+'[<%= locale%>]'}" placeholder="<%= I18nVariable.from_locale(locale) %>">
               </div>
             <% end %>
             </div>
             <div class="btn-group" data-toggle="buttons-radio">
-            <% @site_valid_locales.each do |locale| %>
-              <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
               <a class="btn <%= active %>" href="${'#'+_title_translations[0]+'_<%= locale%>'}" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
             <% end %>
             </div>
@@ -79,8 +79,8 @@
         <div class="input-append">
           <div class="tab-content">
 
-            <% @site_valid_locales.each do |locale| %>
-              <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
 
             <div class="tab-pane <%= active %> fade in" id="${_placeholder[0]+'_<%= locale %>'}">
               <input type="text" data-type="lang_<%= locale %>" placeholder="<%= I18nVariable.from_locale(locale) %>" name="${_placeholder[1]+'[<%= locale %>]'}">
@@ -91,8 +91,8 @@
           </div>
           <div class="btn-group" data-toggle="buttons-radio">
 
-            <% @site_valid_locales.each do |locale| %>
-              <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
 
             <a class="btn <%= active %>" href="${'#'+_placeholder[0]+'_<%= locale %>'}" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
             <% end %>
@@ -141,8 +141,8 @@
         <div class="input-append">
           <div class="tab-content">
 
-            <% @site_valid_locales.each do |locale| %>
-              <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
 
             <div class="tab-pane <%= active %> fade in" id=
               {{if templateType == 'typeB'}}
@@ -165,8 +165,8 @@
           </div>
           <div class="btn-group" data-toggle="buttons-radio">
 
-            <% @site_valid_locales.each do |locale| %>
-              <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
 
             <a class="btn <%= active %>" href=
               {{if templateType == 'typeB'}}
@@ -190,8 +190,8 @@
       <div class="controls add-input">
         <div class="add-target single">
           <%= content_tag :div,:class=>"input-append" do%>
-            <% @site_valid_locales.each do |locale| %>
-              <% last = (locale == @site_valid_locales.last ? true : false) %>
+            <% @site_in_use_locales.each do |locale| %>
+              <% last = (locale == @site_in_use_locales.last ? true : false) %>
                 <input type="text" data-type="${_option_list[2]+'_<%= locale %>' }" id="${_option_list[0]+'_<%= locale %>'}" name="${_option_list[1]+'[<%= locale %>]'}" class="input-medium" placeholder="<%= I18nVariable.from_locale(locale) %>">
                 <% if last %>
                   <a href="#" class="btn remove-input"> <i class="icon-trash"></i> </a> 
@@ -246,8 +246,8 @@
 
 <script id="template-input-append" type="text/x-tmpl">
   <%= content_tag :div,:class=>"input-append" do%>
-    <% @site_valid_locales.each do |locale| %>
-      <% last = (locale == @site_valid_locales.last ? true : false) %>
+    <% @site_in_use_locales.each do |locale| %>
+      <% last = (locale == @site_in_use_locales.last ? true : false) %>
         <input type="text" data-type="${_option_list[2]+'_<%= locale %>' }" id="${_option_list[0]+'_<%= locale %>'}" name="${_option_list[1]+'[<%= locale %>]'}" class="input-medium" placeholder="<%= I18nVariable.from_locale(locale) %>">
         <% if last %>
           <a href="#" class="btn remove-input"> <i class="icon-trash"></i> </a> 
diff --git a/app/views/shared/attribute_field/_list_block.html.erb b/app/views/shared/attribute_field/_list_block.html.erb
index fcf78071..89205e95 100644
--- a/app/views/shared/attribute_field/_list_block.html.erb
+++ b/app/views/shared/attribute_field/_list_block.html.erb
@@ -8,8 +8,8 @@
 
                   <%if values.blank? %>
                       <%= content_tag :div,:class=>"input-append" do%>
-                        <% @site_valid_locales.each do |locale| %>
-                          <% last = (locale == @site_valid_locales.last ? true : false) %>
+                        <% @site_in_use_locales.each do |locale| %>
+                          <% last = (locale == @site_in_use_locales.last ? true : false) %>
                           <% p_value = value[locale.to_s] rescue nil%>
                             <%= text_field("#{field_name}[0]", locale,:placeholder=>I18nVariable.from_locale(locale),:class=>"input-medium",:data=>{:type=>"option_lang_0_#{locale}"}) %>
                             <% if last %>
@@ -21,8 +21,8 @@
                       <%values.each do |index,value|%>
 
                         <%= content_tag :div,:class=>"input-append" do%>
-                        <% @site_valid_locales.each do |locale| %>
-                            <% last = (locale == @site_valid_locales.last ? true : false) %>
+                        <% @site_in_use_locales.each do |locale| %>
+                            <% last = (locale == @site_in_use_locales.last ? true : false) %>
                             <% p_value = value[locale.to_s] rescue nil%>
                               <%= text_field("#{field_name}[#{index}]", locale,:value=>p_value,:placeholder=>I18nVariable.from_locale(locale),:class=>"input-medium", :data=>{:type=>"option_lang_#{index}_#{locale}"}) %>
                               <% if last %>
diff --git a/app/views/shared/attribute_field/_placeholder_block.html.erb b/app/views/shared/attribute_field/_placeholder_block.html.erb
index ec26a030..7cd2f709 100644
--- a/app/views/shared/attribute_field/_placeholder_block.html.erb
+++ b/app/views/shared/attribute_field/_placeholder_block.html.erb
@@ -4,8 +4,8 @@
                   <div class="controls">
                       <div class="input-append">
                           <div class="tab-content">
-                            <% @site_valid_locales.each do |locale| %>
-                              <% active = (locale == @site_valid_locales.first ? "active in" : "'") %>
+                            <% @site_in_use_locales.each do |locale| %>
+                              <% active = (locale == @site_in_use_locales.first ? "active in" : "'") %>
                               <%= content_tag :div,:class=>"tab-pane fade #{active}",:id=>"#{name_to_id(field_name)}_#{locale}" do%>
                               <% locale_value = values[locale.to_s] rescue nil%>
                               <%= text_field(field_name, locale,:value=>locale_value,:placeholder=>I18nVariable.from_locale(locale),:data=>{:type=>"lang_#{locale}"}) %>
@@ -14,8 +14,8 @@
                           </div>
 
                           <div class="btn-group" data-toggle="buttons-radio">
-                          <% @site_valid_locales.each do |locale| %>
-                            <% active = (locale == @site_valid_locales.first ? "active" : "") %>
+                          <% @site_in_use_locales.each do |locale| %>
+                            <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
                             <%= link_to I18nVariable.from_locale(locale),"##{name_to_id(field_name)}_#{locale}",:class=>"btn #{active}",:data=>{:toggle=>"tab"}%>
                           <% end %>
                           </div>
diff --git a/config/routes.rb b/config/routes.rb
index 3b638b32..20da690c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -207,6 +207,7 @@ Orbit::Application.routes.draw do
       get 'system_info'
       get 'ui_theme'
       get 'change_design'
+      get 'reset_default_locale'
       get 'preference'
     end
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 9f034f49..064bdf13 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -151,7 +151,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -161,7 +161,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb
index 13cde0f4..4ec5ccde 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb
@@ -133,7 +133,7 @@
 			
 			<ul class="nav nav-tabs">
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? " class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
@@ -141,7 +141,7 @@
 			<div class="tab-content">
 			
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
index 8c0a5766..86286234 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
@@ -31,7 +31,7 @@
     </span>
     <span class="add-on icons-pencil" title='<%= t(:description) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :description_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:description), :value => (form_file.description_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
index f31a16ce..2816262c 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
@@ -3,7 +3,7 @@
   <%= f.text_field :url, class: "input-large", placeholder: t(:url) %>
   <span class="add-on icons-pencil" title="<%= t(:url_alt) %>"></span>
   <span class="tab-content">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
         <%= f.fields_for :title_translations do |f| %>
           <%= f.text_field locale, :class => "input-large", placeholder: t(:url_alt), :value => (form_link.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb
index 6bb831a2..3c909064 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb
@@ -14,7 +14,7 @@
 				</ul>
 			</div>
 		</td>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= archive_file_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 	</tr>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb
index 03609336..7363fe68 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb
@@ -11,7 +11,7 @@
 	
 	<div id="widget-title">
 		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/index.html.erb
index 0d2c0339..9fb62327 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/index.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/index.html.erb
@@ -6,7 +6,7 @@
 	<thead>
 		<tr>
 			<th class="span1-2"><%= t('archive_file_category.key') %></th>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 		</tr>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
index 648225d8..1583a0be 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
@@ -102,7 +102,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -112,7 +112,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb
index 4d58c1b0..645c1638 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title="<%= t('file.name') %>"></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :file_title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t('file.name'), :value => (form_file.file_title_translations[locale] rescue nil) %>
@@ -38,7 +38,7 @@
     <span class="add-on btn-group btn" title="<%= t('archive.show_lang') %>">
       <i class="icons-earth"></i> <span class="caret"></span>
       <ul class="dropdown-menu">
-      	<% @site_valid_locales.each do |locale| %>
+      	<% @site_in_use_locales.each do |locale| %>
         <li>
           <label class="checkbox">
           	<%= check_box_tag "archive_file[archive_file_multiples_attributes][#{( form_file.new_record? ? 'new_archive_file_multiples' : "#{i}" )}][choose_lang][]", locale, (form_file.choose_lang.nil? ? true : form_file.choose_lang.include?(locale)) %>
diff --git a/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_ask_category.html.erb b/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_ask_category.html.erb
index 4847bd9d..fd39498b 100644
--- a/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_ask_category.html.erb
+++ b/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_ask_category.html.erb
@@ -11,7 +11,7 @@
     </div>
   <% end -%>
   </td>
-  <% @site_valid_locales.each do |locale| %>
+  <% @site_in_use_locales.each do |locale| %>
     <td><%= ask_category.name_translations[locale] rescue nil %></td>
   <% end %>
 </tr>
diff --git a/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_form.html.erb b/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_form.html.erb
index 9a901586..ed9f759f 100644
--- a/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_form.html.erb
+++ b/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_form.html.erb
@@ -9,7 +9,7 @@
 
 	<div id="widget-title">
 		<%= f.fields_for :name_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/index.html.erb b/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/index.html.erb
index 95935935..1050218f 100644
--- a/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/index.html.erb
+++ b/vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/index.html.erb
@@ -20,7 +20,7 @@
   <thead>
     <tr>
       <th class="span1-2"></th>
-      <% @site_valid_locales.each do |locale| %>
+      <% @site_in_use_locales.each do |locale| %>
         <th class="span1-2"></th>
     <% end %>
     </tr>
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
index ee937ea6..d9391d77 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
@@ -89,14 +89,14 @@
 <!-- Language Tabs -->
 <div class="nav-name"><strong>Language</strong></div>
 <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
     <% end %>
 </ul>
 
 <!-- Language -->
 <div class="tab-content language-area">
-<% @site_valid_locales.each_with_index do |locale, i| %>
+<% @site_in_use_locales.each_with_index do |locale, i| %>
     <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
         <div class="control-group input-title">
             <%= f.label :title , t('faq.question'), :class=>"control-label muted" %>
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_file.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_file.html.erb
index 87b32a71..5184d7eb 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_file.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_qa_file.title_translations[locale] rescue nil) %>
@@ -31,7 +31,7 @@
     </span>
     <span class="add-on icons-pencil" title='<%= t(:description) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :description_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:description), :value => (form_qa_file.description_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_link.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_link.html.erb
index fbf06932..f10993b0 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_link.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form_qa_link.html.erb
@@ -3,7 +3,7 @@
   <%= f.text_field :url, class: "input-large", placeholder: t(:url) %>
   <span class="add-on icons-pencil" title="<%= t(:url_alt) %>"></span>
   <span class="tab-content">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
         <%= f.fields_for :title_translations do |f| %>
           <%= f.text_field locale, :class => "input-large", placeholder: t(:url_alt), :value => (form_link.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/_form.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/_form.html.erb
index 86f1d591..f9513922 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/_form.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/_form.html.erb
@@ -62,7 +62,7 @@
               </div>
               <div class="nav-name"><strong>Language</strong></div>
                  <ul class="nav nav-pills language-nav">
-                  <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <% @site_in_use_locales.each_with_index do |locale, i| %>
                       <li <%= (i == 0 ? 'class=active' : '') %>>
                         <a href=".<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                       </li>
@@ -72,7 +72,7 @@
               <!-- Language Tabs -->
                
                  
-                    <% @site_valid_locales.each_with_index do |locale, i| %>
+                    <% @site_in_use_locales.each_with_index do |locale, i| %>
 
                          <div class="tab-pane fade in <%= (i == 0 ? 'active' : '') %> <%= locale %>">
                           <div class="control-group input-title">
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb
index 5a55ba06..d58a8a45 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb
@@ -124,9 +124,9 @@
                   <input type="checkbox" value="<%= tag.id.to_s %>">
                 </p>
                 <a>
-                  <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <% @site_in_use_locales.each_with_index do |locale, i| %>
                     <span class="tag"><%= tag.name_translations[locale] %></span>
-                    <% if @site_valid_locales.count-1 != i %>
+                    <% if @site_in_use_locales.count-1 != i %>
                       /
                     <% end %>  
                   <% end %>
@@ -148,7 +148,7 @@
         <form for="description" method="post" data-remote="true" action="/panel/gallery/back_end/update_image">
           <fieldset>
             <legend>Description</legend>
-             <% @site_valid_locales.each_with_index do |locale, i| %>
+             <% @site_in_use_locales.each_with_index do |locale, i| %>
                 <label><%= I18nVariable.from_locale(locale) %></label>
                 <textarea rows="10" name="album_image[description_translations][<%= locale %>]" for="<%= locale %>"></textarea>
             <% end %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
index cfd32bc8..da3856ba 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
@@ -7,7 +7,7 @@
 	  <!-- Language Tabs -->
 	  <div class="nav-name"><strong><%= t(:language) %></strong></div>
 	  <ul class="nav nav-pills language-nav">
-	    <% @site_valid_locales.each_with_index do |locale, i| %>
+	    <% @site_in_use_locales.each_with_index do |locale, i| %>
 	      <li class="<%= 'active' if i == 0 %>">
 	        <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
 	      </li>
@@ -16,7 +16,7 @@
 
 	  <!-- Language -->
   	<div class="tab-content language-area">
-			<% @site_valid_locales.each_with_index do |locale, i| %>
+			<% @site_in_use_locales.each_with_index do |locale, i| %>
         <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 	        <!-- Title-->
 	        <div class="control-group input-title">
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_form.html.erb
index 7394aff7..b7ea06dc 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_form.html.erb
@@ -12,7 +12,7 @@
 	<div id="widget-title">
 		<% if @types.is_localized?(:title) %>
 			<%= f.fields_for :title_translations do |f| %>
-			  <% @site_valid_locales.each do |locale| %>
+			  <% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_quick_edit_qe.html.erb
index 005ae64e..cc537cbf 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_quick_edit_qe.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_quick_edit_qe.html.erb
@@ -8,7 +8,7 @@
 	</div>
 	<div id="widget-title">
 		<%= f.fields_for :title_translations  do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_writing_book_category.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_writing_book_category.html.erb
index 06aad950..c95102c8 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_writing_book_category.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_writing_book_category.html.erb
@@ -13,7 +13,7 @@
 			</div>
 		</td>
 		<% if @types.is_localized?(:title) %>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= writing_book_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 		<% else %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/index.html.erb
index 92208be8..6cf78988 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/index.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/index.html.erb
@@ -8,7 +8,7 @@
 		<tr>
 			<th class="span1-2"><%= t('writing_book_category.key') %></th>
 			<% if @types.is_localized?(:title) %>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 			<% else %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_author_type_qe.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_author_type_qe.html.erb
index efb32fef..eeb55859 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_author_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_author_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
index 851526fe..3ead8d38 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
@@ -186,7 +186,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -196,7 +196,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb
index c21f4851..465d855b 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb
index 7ce24beb..d6100213 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -24,7 +24,7 @@
 <div class="overview" content-layout="simple" base-width="420">
    <ul class="s_form" isotope="true">
         <li class="s_grid_row" >
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
          
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form_file.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
index 49ab70fa..8c21619a 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
@@ -59,7 +59,7 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
@@ -71,7 +71,7 @@
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					<div class="title">
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form_file.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_form.html.erb
index 47931776..7835731b 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_form.html.erb
@@ -12,7 +12,7 @@
 	<div id="widget-title">
 		<% if @types.is_localized?(:title) %>
 			<%= f.fields_for :title_translations do |f| %>
-			  <% @site_valid_locales.each do |locale| %>
+			  <% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_quick_edit_qe.html.erb
index 005ae64e..cc537cbf 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_quick_edit_qe.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_quick_edit_qe.html.erb
@@ -8,7 +8,7 @@
 	</div>
 	<div id="widget-title">
 		<%= f.fields_for :title_translations  do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_writing_conference_category.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_writing_conference_category.html.erb
index 06f4482a..24ae0ee9 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_writing_conference_category.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_writing_conference_category.html.erb
@@ -13,7 +13,7 @@
 			</div>
 		</td>
 		<% if @types.is_localized?(:title) %>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= writing_conference_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 		<% else %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/index.html.erb
index 359c0e4a..16411a10 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/index.html.erb
@@ -8,7 +8,7 @@
 		<tr>
 			<th class="span1-2"><%= t('writing_conference_category.key') %></th>
 			<% if @types.is_localized?(:title) %>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 			<% else %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_author_type_qe.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_author_type_qe.html.erb
index d38241dd..76ce37bd 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_author_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_author_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb
index eee673a3..1f305232 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb
@@ -191,7 +191,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -201,7 +201,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_paper_type_qe.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_paper_type_qe.html.erb
index 2c9a9797..f8053785 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_paper_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_paper_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index 6f514484..efe9aa38 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -10,7 +10,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -32,7 +32,7 @@
     <div class="overview" content-layout="simple" base-width="420">
        <ul class="s_form" isotope="true">
             <li class="s_grid_row" >
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
              <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb
index 02b09142..69693de7 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb
@@ -70,7 +70,7 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
@@ -87,7 +87,7 @@
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					<div class="title">
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form_file.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
index f147f4d7..af76296f 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
@@ -140,7 +140,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -150,7 +150,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb
index 804e52a7..20e509ca 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -34,7 +34,7 @@
                 <%= f.date_select :end_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %>
             </li>
             <li class="s_grid_row">
-             <% @site_valid_locales.each_with_index do |locale, i| %>
+             <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
                <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
index 8bd3ad12..b3bf0d91 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
@@ -42,14 +42,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_experience_category.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_experience_category.html.erb
index 06aad950..c95102c8 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_experience_category.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_experience_category.html.erb
@@ -13,7 +13,7 @@
 			</div>
 		</td>
 		<% if @types.is_localized?(:title) %>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= writing_book_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 		<% else %>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_form.html.erb
index 7394aff7..b7ea06dc 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_form.html.erb
@@ -12,7 +12,7 @@
 	<div id="widget-title">
 		<% if @types.is_localized?(:title) %>
 			<%= f.fields_for :title_translations do |f| %>
-			  <% @site_valid_locales.each do |locale| %>
+			  <% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_quick_edit_qe.html.erb
index 005ae64e..cc537cbf 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_quick_edit_qe.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_quick_edit_qe.html.erb
@@ -8,7 +8,7 @@
 	</div>
 	<div id="widget-title">
 		<%= f.fields_for :title_translations  do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/index.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/index.html.erb
index 92208be8..6cf78988 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/index.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/index.html.erb
@@ -8,7 +8,7 @@
 		<tr>
 			<th class="span1-2"><%= t('writing_book_category.key') %></th>
 			<% if @types.is_localized?(:title) %>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 			<% else %>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience_type_qe.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience_type_qe.html.erb
index afacfd8f..0dfe2b53 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
index 144462c3..4c64aaad 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
@@ -148,7 +148,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -158,7 +158,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb
index fab775e9..df0e96c6 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -24,7 +24,7 @@
 <div class="overview" content-layout="simple" base-width="420">
        <ul class="s_form" isotope="true">
         <li class="s_grid_row">
-             <% @site_valid_locales.each_with_index do |locale, i| %>
+             <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
              <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
index 75901a67..902d9767 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
@@ -47,14 +47,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor_type_qe.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor_type_qe.html.erb
index 888370c9..de86537a 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb
index c3eca3f2..3f1451f4 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_form.html.erb
index 0a9263d3..a9a3a773 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_form.html.erb
@@ -12,7 +12,7 @@
 	<div id="widget-title">
 		<% if @types.is_localized?(:title) %>
 			<%= f.fields_for :title_translations do |f| %>
-			  <% @site_valid_locales.each do |locale| %>
+			  <% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_quick_edit_qe.html.erb
index 005ae64e..cc537cbf 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_quick_edit_qe.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_quick_edit_qe.html.erb
@@ -8,7 +8,7 @@
 	</div>
 	<div id="widget-title">
 		<%= f.fields_for :title_translations  do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_writing_journal_category.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_writing_journal_category.html.erb
index 60d717bf..cb0fb429 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_writing_journal_category.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_writing_journal_category.html.erb
@@ -14,7 +14,7 @@
 			</div>
 		</td>
 		<% if @types.is_localized?(:title) %>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= writing_journal_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 		<% else %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/index.html.erb
index 66abbf4c..a3651d81 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/index.html.erb
@@ -8,7 +8,7 @@
 		<tr>
 			<th class="span1-2"><%= t('writing_journal_category.key') %></th>
 			<% if @types.is_localized?(:title) %>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 			<% else %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_author_type_qe.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_author_type_qe.html.erb
index b609538d..33f0de03 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_author_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_author_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
index 9fc636ea..ee66c7ae 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
@@ -223,7 +223,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -233,7 +233,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_level_type_qe.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_level_type_qe.html.erb
index 8836cc87..0960b548 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_level_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_level_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
index 443bc556..f8728087 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -33,7 +33,7 @@
     <div class="overview" content-layout="simple" base-width="420">
           <ul class="s_form" isotope="true">
             <li class="s_grid_row" >
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
             <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
index c76c0e18..2f62b1c8 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
@@ -75,14 +75,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					<div class="title">
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form_file.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
index f9b83f18..cdfe89ad 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
@@ -156,7 +156,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -166,7 +166,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb
index 5059b664..f1ef9cae 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -24,7 +24,7 @@
 <div class="overview" content-layout="simple" base-width="420">
   <ul class="s_form" isotope="true">
       <li class="s_grid_row">
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
              <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form_file.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
index 552175e6..41e3edc4 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
@@ -37,14 +37,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form_file.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
index 7394aff7..b7ea06dc 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
@@ -12,7 +12,7 @@
 	<div id="widget-title">
 		<% if @types.is_localized?(:title) %>
 			<%= f.fields_for :title_translations do |f| %>
-			  <% @site_valid_locales.each do |locale| %>
+			  <% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_quick_edit_qe.html.erb
index 005ae64e..cc537cbf 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_quick_edit_qe.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_quick_edit_qe.html.erb
@@ -8,7 +8,7 @@
 	</div>
 	<div id="widget-title">
 		<%= f.fields_for :title_translations  do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_book_category.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_book_category.html.erb
index 06aad950..c95102c8 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_book_category.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_book_category.html.erb
@@ -13,7 +13,7 @@
 			</div>
 		</td>
 		<% if @types.is_localized?(:title) %>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= writing_book_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 		<% else %>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
index 92208be8..6cf78988 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
@@ -8,7 +8,7 @@
 		<tr>
 			<th class="span1-2"><%= t('writing_book_category.key') %></th>
 			<% if @types.is_localized?(:title) %>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 			<% else %>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
index f1b8fd51..ba776d4f 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
@@ -164,7 +164,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -174,7 +174,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_patent_type_qe.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_patent_type_qe.html.erb
index 99a8b39b..da97ddcf 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_patent_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_patent_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb
index 94f01142..d3f5097f 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -24,7 +24,7 @@
 <div class="overview" content-layout="simple" base-width="420">
  <ul class="s_form" isotope="true">
     <li class="s_grid_row">
-          <% @site_valid_locales.each_with_index do |locale, i| %>
+          <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
              <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form_file.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
index f8e5ef5a..1416b1fd 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
@@ -47,14 +47,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_form.html.erb
index b7486f63..8aa684d8 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_form.html.erb
@@ -11,7 +11,7 @@
 	
 	<div id="widget-title">
 		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_project_category.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_project_category.html.erb
index 097bda8a..b6b16a93 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_project_category.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_project_category.html.erb
@@ -10,7 +10,7 @@
 				</ul>
 			</div>
 		</td>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= project_category.title_translations[locale] %></td>
 		<% end %>
 	</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/index.html.erb
index 8490b39e..c9168575 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/index.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/index.html.erb
@@ -6,7 +6,7 @@
 	<thead>
 		<tr>
 			<th class="span1-2"><%= t('project_category.key') %></th>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
 		</tr>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
index 9a8b30ad..ffcccb25 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
@@ -164,7 +164,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -174,7 +174,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project_type_qe.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project_type_qe.html.erb
index bf50ab77..294b0344 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project_type_qe.html.erb
@@ -15,7 +15,7 @@
 			</div>
 
 			<%= f.fields_for :title_translations do |f| %>
-				<% @site_valid_locales.each do |locale| %>
+				<% @site_in_use_locales.each do |locale| %>
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb
index 3c77d551..cd48c9d9 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -24,7 +24,7 @@
 <div class="overview" content-layout="simple" base-width="420">
      <ul class="s_form" isotope="true">
         <li class="s_grid_row">
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
              <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form_file.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
index 5dcc5d94..390287de 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
@@ -52,14 +52,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form_file.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
index 7181a674..312c8049 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
@@ -140,7 +140,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -150,7 +150,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb
index fa9848e5..07088ba2 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb
@@ -21,7 +21,7 @@
     </label>
     <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
           <%= f.fields_for :title_translations do |f| %>
             <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb
index aa159af8..5ad000d8 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb
@@ -11,7 +11,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -24,7 +24,7 @@
 <div class="overview" content-layout="simple" base-width="420">
    <ul class="s_form" isotope="true">
         <li class="s_grid_row">
-            <% @site_valid_locales.each_with_index do |locale, i| %>
+            <% @site_in_use_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
                <div class="form_fix" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form_file.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form_file.html.erb
index f957f6b1..1db9af6c 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form_file.html.erb
@@ -13,7 +13,7 @@
       <% end  %>
     </div>
   </td>
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
         <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
         <% data = "data-language=" + locale  %>
       <td  <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/plugin_intros/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/plugin_intros/_form.html.erb
index 9cc868f5..1dfa2245 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/plugin_intros/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/plugin_intros/_form.html.erb
@@ -7,7 +7,7 @@
     <div class="sdm_t hh1 ">Language</div>
     <div class="admbg sdm_o language_select">
       <ul>
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           <li><a class="hp hh1 admtxt" href="" data-lang="<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
         <% end %>
       </ul>
@@ -36,7 +36,7 @@
           </ul>
         </div>
 		</li>
-	 	<% @site_valid_locales.each_with_index do |locale, i| %>
+	 	<% @site_in_use_locales.each_with_index do |locale, i| %>
 	 		<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
             <% data = "data-language=" + locale  %>
             <li class="s_grid_row" <%= style %> <%= data %>>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
index 2fd6fbef..9a2c2d00 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
@@ -37,14 +37,14 @@
 			</div>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_in_use_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 					<div class="title">
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form_file.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form_file.html.erb
index a91d6a85..33258479 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form_file.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form_file.html.erb
@@ -13,7 +13,7 @@
 			
 				<div class="tab-content">
 				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
+					<% @site_in_use_locales.each_with_index do |locale, i| %>
 					
 					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb
index 1b86a748..df9a8291 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb
@@ -27,7 +27,7 @@
         <div class="controls">
           <div class="input-append">
             <div class="tab-content">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                    <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="title_<%= locale %>">
                     <%= f.fields_for :title_translations do |f| %>
                       <%= f.text_field locale, :class=>'span4', :value => (@survey.title_translations[locale] rescue nil), :placeholder => I18nVariable.from_locale(locale) %>
@@ -36,7 +36,7 @@
                 <% end %>
             </div>
             <div class="btn-group" data-toggle="buttons-radio">
-               <% @site_valid_locales.each_with_index do |locale, i| %>
+               <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#title_<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
             </div>
@@ -49,11 +49,11 @@
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
-                <% @site_valid_locales.each_with_index do |locale, i| %>
+                <% @site_in_use_locales.each_with_index do |locale, i| %>
                   <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
                 <% end %>
               </div>
-              <% @site_valid_locales.each_with_index do |locale, i| %>
+              <% @site_in_use_locales.each_with_index do |locale, i| %>
                  <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
                   <%= f.fields_for :description_translations do |f| %>
                     <%= f.text_area locale, :class=>'resizable', :value => (@survey.description_translations[locale] rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
index 2f265ce1..2be932ad 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
@@ -8,7 +8,7 @@
     <h3 class="widget-title"><i class="icons-help"></i><%= t('survey.question') %></h3>
     <div class="widget-content">
       <div class="tab-content">
-        <% @site_valid_locales.each_with_index do |locale, i| %>
+        <% @site_in_use_locales.each_with_index do |locale, i| %>
           
           <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_option.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_option.html.erb
index 082767e7..f658da25 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_option.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_option.html.erb
@@ -1,7 +1,7 @@
 <tr id="<%= "survey_question_option_#{form_survey_question_option.id}" if !form_survey_question_option.new_record? %>" class='survey_question_option_item'>
   <td>
     <div class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
           <%= f.fields_for :name_translations do |f| %>
             <%= I18nVariable.from_locale(locale) %>
diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_radiogroup.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_radiogroup.html.erb
index 640e6404..10a1d04f 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_radiogroup.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question_radiogroup.html.erb
@@ -1,7 +1,7 @@
 <tr id="<%= "survey_question_radiogroup_#{form_survey_question_radiogroup.id}" if !form_survey_question_radiogroup.new_record? %>" class='survey_question_radiogroup_item'>
   <td>
     <div class="tab-content">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% @site_in_use_locales.each_with_index do |locale, i| %>
         <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
           <%= f.fields_for :name_translations do |f| %>
             <%= I18nVariable.from_locale(locale) %>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
index 6c9e5ac3..347c8b30 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
@@ -11,7 +11,7 @@
 	
 	<div id="widget-title">
 		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
+		  <% @site_in_use_locales.each do |locale| %>
 				<div class="control-group">
 					<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
index bb278435..4c6af376 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
@@ -13,7 +13,7 @@
 				</div>
 			<% end -%>
 		</td>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 		<td><%= web_link_category.title_translations[locale] rescue nil %></td>
 		<% end %>
 	</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
index 8be77cc3..c72d1a83 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
@@ -8,7 +8,7 @@
 				<thead>
 					<tr>
 						<th class="span1-2"><%= t(:key) %></th>
-						<% @site_valid_locales.each do |locale| %>
+						<% @site_in_use_locales.each do |locale| %>
 						<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 						<% end %>
 					</tr>
@@ -22,7 +22,7 @@
 	<thead>
 		<tr>
 			<th class="span1-2"></th>
-			<% @site_valid_locales.each do |locale| %>
+			<% @site_in_use_locales.each do |locale| %>
 			<th class="span1-2"></th>
 			<% end %>
 		</tr>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
index 2ae6a557..c614e754 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
@@ -92,7 +92,7 @@
   <!-- Language Tabs -->
   <div class="nav-name"><strong><%= t(:language) %></strong></div>
   <ul class="nav nav-pills language-nav">
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
       </li>
@@ -102,7 +102,7 @@
   <!-- Language -->
   <div class="tab-content language-area">
 
-    <% @site_valid_locales.each_with_index do |locale, i| %>
+    <% @site_in_use_locales.each_with_index do |locale, i| %>
     
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">