Changes for i18n yml
This commit is contained in:
1 parent
a579e16109
commit
8b2bc207de
171 files changed
+1215
-3717
No files matched your search
+3
-3
@@ -55,7 +55,7 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendCont
|
||||
|
||||
respond_to do |format|
|
||||
if @web_link_category.save
|
||||
format.html { redirect_to(panel_web_resource_back_end_web_link_categorys_url, :notice => t('web_link_category.create_web_link_category_success')) }
|
||||
format.html { redirect_to(panel_web_resource_back_end_web_link_categorys_url, :notice => t('web_link.create_web_link_category_success')) }
|
||||
format.js
|
||||
else
|
||||
format.html { render :action => "new" }
|
||||
@@ -73,7 +73,7 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendCont
|
||||
|
||||
respond_to do |format|
|
||||
if @web_link_category.update_attributes(params[:web_link_category])
|
||||
format.html { redirect_to(panel_web_resource_back_end_web_link_categorys_url, :notice => t('web_link_category.update_web_link_category_success')) }
|
||||
format.html { redirect_to(panel_web_resource_back_end_web_link_categorys_url, :notice => t('web_link.update_web_link_category_success')) }
|
||||
# format.xml { head :ok }
|
||||
format.js
|
||||
else
|
||||
@@ -96,7 +96,7 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendCont
|
||||
format.js
|
||||
end
|
||||
else
|
||||
flash[:error] = t("web_link_category.update_failed")
|
||||
flash[:error] = t("update.fail")
|
||||
format.html { render :action => "index" }
|
||||
end
|
||||
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
<%if at_least_module_manager %>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<li><%= link_to t('web_resource.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %></li>
|
||||
<li><%= link_to show_toggle_archive_btn(web_link_category), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true ,:class=> "archive_toggle"%></li>
|
||||
<li><%= link_to t(:edit), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %></li>
|
||||
<li><%= link_to show_toggle_archive_btn(web_link_category), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t(:sure?), :method => :delete, :remote => true ,:class=> "archive_toggle"%></li>
|
||||
<li><%= show_web_link_permission_link web_link_category %></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1-2"><%= t('web_link_category.key') %></th>
|
||||
<th class="span1-2"><%= t(:key) %></th>
|
||||
<% @site_valid_locales.each do |locale| %>
|
||||
<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
|
||||
<% end %>
|
||||
|
||||
Vendored
+2
-2
@@ -54,7 +54,7 @@
|
||||
<div id="post-body">
|
||||
<div id="post-body-content" class="clear">
|
||||
|
||||
<%= f.label :category ,t("web_resource.category")%>
|
||||
<%= f.label :category ,t(:category)%>
|
||||
<%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.title, t.id ]} %>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
@@ -69,7 +69,7 @@
|
||||
|
||||
<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
|
||||
<div class="title">
|
||||
<%= f.label :name ,t("web_resource.name")%>
|
||||
<%= f.label :name ,t(:name)%>
|
||||
<%= f.fields_for :title_translations do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_field locale, :class=>'post-title', :value => (@web_link.title_translations[locale] rescue nil) %>
|
||||
|
||||
+4
-4
@@ -1,5 +1,5 @@
|
||||
<%= render_sort_bar(true, delete_panel_web_resource_back_end_web_links_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
|
||||
['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'],
|
||||
['category', 'bulletin_category', 'span2', 'bulletin.category'],
|
||||
['title', 'title','span3', 'bulletin.title'],
|
||||
['tags', 'tags', 'span2', 'bulletin.tags']).html_safe %>
|
||||
['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', :status],
|
||||
['category', 'bulletin_category', 'span2', :category],
|
||||
['title', 'title','span3', :title],
|
||||
['tags', 'tags', 'span2', :tags]).html_safe %>
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
<h1><%= t('web_resource.editing_web_resource') %></h1>
|
||||
<h1><%= t('web_link.editing_web_resource') %></h1>
|
||||
|
||||
<%= form_for @web_link, :url => panel_web_resource_back_end_web_link_path(@web_link), :html => {:class => 'clear'} do |f| %>
|
||||
<%= render :partial => 'form', :locals => {:f => f} %>
|
||||
|
||||
Vendored
+1
-1
@@ -15,7 +15,7 @@
|
||||
</table>
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %>
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="web_link_pagination" class="paginationFixed">
|
||||
<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
|
||||
vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
Vendored
+2
-2
@@ -9,8 +9,8 @@
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th><%= t('web_link.category') %></th>
|
||||
<th><%= t('web_link.name') %></th>
|
||||
<th><%= t(:category) %></th>
|
||||
<th><%= t(:name) %></th>
|
||||
</tr>
|
||||
|
||||
<% @web_links.each do |post| %>
|
||||
|
||||
Vendored
+5
-5
@@ -1,16 +1,16 @@
|
||||
<% if @current_category %>
|
||||
<h1 class="h1"><%= @current_category.title + " " + t('web_resource.list_lower') %></h1>
|
||||
<h1 class="h1"><%= @current_category.title + " " + t(:list_lower) %></h1>
|
||||
<% elsif @tag %>
|
||||
<h1 class="h1"><%= @tag[I18n.locale] + " " + t('web_resource.list_lower') %></h1>
|
||||
<h1 class="h1"><%= @tag[I18n.locale] + " " + t(:list_lower) %></h1>
|
||||
<% else %>
|
||||
<h1 class="h1"><%= t('web_resource.list_link') %></h1>
|
||||
<h1 class="h1"><%= t('list.link') %></h1>
|
||||
<% end %>
|
||||
|
||||
<table class="table table-bordered">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th><%= t('web_resource.category') %></th>
|
||||
<th><%= t('web_resource.name') %></th>
|
||||
<th><%= t(:category) %></th>
|
||||
<th><%= t(:name) %></th>
|
||||
</tr>
|
||||
<% @web_links.each do |post| %>
|
||||
<tr>
|
||||
|
||||
Reference in new issue
Block a user