lang/TRANSLATION.markdown lang/ui/en.yml @@ -5,6 +5,7 @@ = 1.0.4 * Changes to Japanese language translations * Use authlogic instead of restful_authentication (augthlogic gem now required, new migrations required) (thanks jnimety!) +* Big overhaul of i18n by sdecleire, more international-friendly translation tokens. `en` is now the default locale (instead of `en-US`) = 1.0.3 CHANGELOG @@ -45,7 +45,7 @@ class AdminController < BaseController def deactivate_user user = User.find(params[:id]) user.deactivate - flash[:notice] = "The user was deactivated".l + flash[:notice] = :the_user_was_deactivated.l redirect_to :action => :users end app/controllers/admin_controller.rb @@ -40,7 +40,7 @@ class HomepageFeaturesController < BaseController respond_to do |format| if @homepage_feature.save - flash[:notice] = :homepage_feature_was_successfully_created.l + flash[:notice] = :homepage_feature_created.l format.html { redirect_to homepage_feature_url(@homepage_feature) } else app/controllers/homepage_features_controller.rb @@ -23,7 +23,7 @@ class PagesController < BaseController def show @page = Page.live.find(params[:id]) unless logged_in? || @page.page_public - flash[:error] = :this_page_is_not_public_youll_need_to_create_an_account_and_log_in_to_access_it.l + flash[:error] = :page_not_public_warning.l redirect_to :controller => 'sessions', :action => 'new' end rescue app/controllers/pages_controller.rb @@ -113,7 +113,7 @@ class PostsController < BaseController if @post.save @post.create_poll(params[:poll], params[:choices]) if params[:poll] - flash[:notice] = @post.category ? :post_created_for_category.l_with_args(:category => @post.category.name.singularize) : "Your post was successfully created.".l + flash[:notice] = @post.category ? :post_created_for_category.l_with_args(:category => @post.category.name.singularize) : :your_post_was_successfully_created.l format.html { if @post.is_live? redirect_to @post.category ? category_path(@post.category) : user_post_path(@user, @post) app/controllers/posts_controller.rb @@ -147,12 +147,10 @@ module BaseHelper case @controller.action_name when 'show' if params[:type] -# title = (params[:type].downcase.pluralize + '_tagged').l title = I18n.translate('all_' + params[:type].downcase.pluralize + '_tagged', :tag_name => @tags.map(&:name).join(', ')) else title = :posts_photos_and_bookmarks.l(:name => @tags.map(&:name).join(', ')) end -# title += ' ' + @tags.map(&:name).join(', ') title += ' (' + :related_tags.l + ': ' + @related_tags.join(', ') + ')' if @related_tags title += ' | ' + app_base @canonical_url = tag_url(URI.escape(@tags_raw, /[\/.?#]/)) if @tags_raw @@ -163,22 +161,22 @@ module BaseHelper if @category and @category.name title = :posts_photos_and_bookmarks.l(:name => @category.name) + ' &raquo; ' + app_base + tagline else - title = :showing_categories.l+' &raquo; ' + app_base + tagline + title = :showing_categories.l + ' &raquo; ' + app_base + tagline end when 'skills' if @skill and @skill.name - title = :find_an_expert_in.l+' ' + @skill.name + ' &raquo; ' + app_base + tagline + title = :find_an_expert_in.l + ' ' + @skill.name + ' &raquo; ' + app_base + tagline else - title = :find_experts.l+' &raquo; ' + app_base + tagline + title = :find_experts.l + ' &raquo; ' + app_base + tagline end when 'sessions' - title = :login.l+' &raquo; ' + app_base + tagline + title = :login.l + ' &raquo; ' + app_base + tagline end if @page_title title = @page_title + ' &raquo; ' + app_base + tagline elsif title == app_base - title = :showing.l+' ' + @controller.controller_name.l + ' &raquo; ' + app_base + tagline + title = :showing.l + ' ' + @controller.controller_name.l + ' &raquo; ' + app_base + tagline end title @@ -285,7 +283,7 @@ module BaseHelper def pagination_info_for(paginator, options = {}) options = {:prefix => :showing.l, :connector => '-', :suffix => ""}.merge(options) window = paginator.first_item.to_s + options[:connector] + paginator.last_item.to_s - options[:prefix] + " <strong>#{window}</strong> " + 'of'.l + " #{paginator.size} " + options[:suffix] + options[:prefix] + " <strong>#{window}</strong> " + :of.l + " #{paginator.size} " + options[:suffix] end @@ -293,12 +291,6 @@ module BaseHelper session[:last_active] ||= Time.now.utc end - def submit_tag(value = :save_changes.l, options={} ) - or_option = options.delete(:or) - return super + "<span class='button_or'>or " + or_option + "</span>" if or_option - super - end - def ajax_spinner_for(id, spinner="spinner.gif") "<img src='/plugin_assets/community_engine/images/#{spinner}' style='display:none; vertical-align:middle;' id='#{id.to_s}_spinner'> " end app/helpers/base_helper.rb @@ -1,13 +1,13 @@ .yui-gc .yui-u.first -box :class => "fresh" do - %h3="What's fresh".l + %h3= :whats_fresh.l =render :partial => "activities/activity", :collection => @activities .pagination=paginating_links @activities if @activities.page_count > 1 .yui-u -box do - %h3="Tags".l + %h3= :tags.l - tag_cloud @popular_tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class| = link_to name, tag_path(URI.escape(name, /[\/.?#]/)), :class => css_class %h6.all=link_to :all_tags.l, tags_path app/views/activities/index.html.haml @@ -31,7 +31,7 @@ %td = h user.email %td - = user.active? ? 'active'.l : 'inactive'.l + = user.active? ? :active.l : inactive.l %td = link_to( :assume_id.l , assume_user_path(user) ) = (" | " + link_to(:activate.l, :controller => "/admin", :action => "activate_user", :id => user.id)) unless user.active? app/views/admin/users.html.haml @@ -23,7 +23,7 @@ = render :partial => "users/sidebar_user", :locals => {:user => user} -box :class => "alt" do - %h3=:popular_catgory.l(:name => @category.name) + %h3=:popular_category.l(:name => @category.name) %ul.list.page - @popular_posts.each do |post| =render :partial => 'posts/sidebar_post', :locals => {:post => post} app/views/categories/show.html.haml @@ -1,7 +1,7 @@ -if comment.user .hentry{:id => "comment_#{comment.id}"} .vcard.author - %h5= link_to image_tag(comment.user.avatar_photo_url(:thumb), :height => '50', :width => '50', :alt => "#{comment.user.login}"), user_path(comment.user), :rel => 'bookmark', :class => 'photo', :title => :users_profil.l(:user => comment.user.login) + %h5= link_to image_tag(comment.user.avatar_photo_url(:thumb), :height => '50', :width => '50', :alt => "#{comment.user.login}"), user_path(comment.user), :rel => 'bookmark', :class => 'photo', :title => :users_profile.l(:user => comment.user.login) %ul %li.fn = link_to comment.user.login, user_path(comment.user), :class => 'url' @@ -10,7 +10,7 @@ %abbr.published{"title"=>"#{comment.created_at}"} = I18n.l(comment.created_at, :format => :short_literal_date) -if ( comment.can_be_deleted_by(current_user) ) - %li.delete=link_to_remote("Delete".l, {:url => comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false', :success => visual_effect(:fade, "comment_#{comment.id}"), :confirm => :are_you_sure_you_want_to_permanently_delete_this_comment.l} ) + %li.delete=link_to_remote(:delete.l, {:url => comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false', :success => visual_effect(:fade, "comment_#{comment.id}"), :confirm => :are_you_sure_you_want_to_permanently_delete_this_comment.l} ) .entry-content= comment.comment -else app/views/comments/_comment.html.haml @@ -15,18 +15,18 @@ .errors - form_remote_for(:comment, :loading => "$$('div#comments div.errors')[0].innerHTML = ''; $('comment_spinner').show();", :before => "tinyMCE.activeEditor.save();", :url => comments_url(commentable.class.to_s.underscore, commentable.id ), :html => {:id => 'new_comment_form', :class => "MainForm"}) do |f| %label - %em="(2000 character limit)".l :comment_character_limit + %em=:comment_character_limit.l = text_area :comment, :comment, {:size => "86x5", :class => "rich_text_editor"} - if !logged_in? && AppConfig.recaptcha_pub_key && AppConfig.recaptcha_priv_key .right{:style => 'margin-top:2em;'}= recaptcha_tags :ajax => true %label{"for"=>"comment[author_name"} - ="Name:".l - %em="(#{'Optional'.l})" + =:name.l + %em="(#{:optional.l})" = f.text_field :author_name, :size => 35 %label{"for"=>"comment[author_email"} - ="#{'E-mail'.l}:" - %em="(#{"Required; won't be shown on site".l})" + ="#{:email.l}:" + %em="(#{:comment_author_email_required.l})" = f.text_field :author_email, :size => 35 %br %label @@ -34,15 +34,15 @@ =:notify_me_of_follow_ups_via_email.l %label{"for"=>"comment[author_url"} - ="Web site (include http://):".l - %em="(#{'Optional'.l})" + =:comment_web_site_label.l + %em="(#{:optional.l})" = f.text_field :author_url, :size => 35 %p - = submit_tag "Add Comment".l + = submit_tag :add_comment.l = image_tag 'spinner.gif', :plugin => "community_engine", :style => 'display:none;', :id => 'comment_spinner' - else - = link_to "Log in to leave a comment".l, new_comment_path(commentable.class, commentable.id) + = link_to :log_in_to_leave_a_comment.l, new_comment_path(commentable.class, commentable.id) = :or.l - = link_to "Create an account".l, signup_path + = link_to :create_an_account.l, signup_path app/views/comments/_comment_form.html.haml @@ -14,6 +14,6 @@ .pagination=paginating_links @comments if @comments.page_count > 1 - %h3="Add Your Comment!".l + %h3=:add_your_comment.l %p= render :partial => 'comments/comment_form', :locals => {:commentable => @commentable} app/views/comments/index.html.haml @@ -13,11 +13,11 @@ %p.subtitle = feed_icon_tag :recent_posts.l, all_sb_posts_path(:format => 'rss') = number_with_delimiter(Topic.count) - = "#{'topics'.l}," + = "#{:topics.l}," = number_with_delimiter(SbPost.count) - = "#{'posts'.l}," + = "#{:posts.l}," = number_with_delimiter(User.count(:conditions => "sb_posts_count>0")) - = 'voices'.l + = :voices.l %table{:border=>"0", :cellspacing=>"0", :cellpadding=>"0", :class=>"wide forums"} %tr app/views/forums/index.html.haml @@ -11,9 +11,9 @@ -box do %p.subtitle = feed_icon_tag @forum.name, forum_sb_posts_path(@forum, :format => :rss) - = pluralize @forum.topics_count, 'topic'.l + = pluralize @forum.topics_count, :topic.l , - = pluralize @forum.sb_posts_count, 'post'.l + = pluralize @forum.sb_posts_count, :post.l - unless @forum.description.blank? = @forum.description_html app/views/forums/show.html.haml @@ -1,7 +1,7 @@ post_time = post.created_at post_time = Time.parse(post_time.to_s).rfc822 if post_time.is_a?(DateTime) #DateTime format doesn't support conversion to rfc822 xm.item do - xm.title "#{h(post.respond_to?(:topic_title) ? post.topic_title : post.topic.title)}, #{h post.topic.sb_posts_count == 1 ? 'posted'.l : 'replied'.l } #{'by'.l} #{h post.user.display_name} (#{post.created_at.ctime})" + xm.title "#{h(post.respond_to?(:topic_title) ? post.topic_title : post.topic.title)}, #{h post.topic.sb_posts_count == 1 ? :posted.l : :replied.l } #{:by.l} #{h post.user.display_name} (#{post.created_at.ctime})" xm.description post.body_html xm.pubDate post_time xm.guid [request.host_with_port, post.forum_id.to_s, post.topic_id.to_s, post.id.to_s].join(":"), "isPermaLink" => "false" app/views/layouts/_post.xml.builder @@ -8,7 +8,7 @@ = render :partial => "/categories/tips", :locals => {:category => nil} -box :class => "alt" do - %a.button.positive{:href => '#', :onclick => "tinyMCE.execCommand('mceCurblyAdvImage');return false;"}="Upload an image for your post".l + %a.button.positive{:href => '#', :onclick => "tinyMCE.execCommand('mceCurblyAdvImage');return false;"}=:upload_an_image_for_your_post.l #yui-main .yui-b app/views/posts/new.html.haml @@ -49,7 +49,7 @@ - if @posts and @posts.next_page %p{ :style => "float:right;" } - = link_to 'Next page'.l, { :page => @posts.next_page }.merge(params.reject{|k,v| k=="page"}) + = link_to :next_page.l, { :page => @posts.next_page }.merge(params.reject{|k,v| k=="page"}) - if @posts.page_count > 1 app/views/sb_posts/index.html.haml @@ -14,7 +14,7 @@ </p> <% if @posts.page_count > 1 -%> -<div class="pagination"><%= 'Pages:'.l %> <strong><%= paginating_links @posts %></strong></div> +<div class="pagination"><%= "#{:pages.l}:" %> <strong><%= paginating_links @posts %></strong></div> <% end -%> <table border="0" cellspacing="0" cellpadding="0" class="posts wide"> app/views/sb_posts/monitored.html.erb @@ -18,7 +18,7 @@ =:choose_a_photo_to_upload.l %em - if @user.vendor? - =:you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products.l + =:vendor_avatar_hint.l =:photos_should_be_x_pixels.l = file_field :avatar, :uploaded_data, :size => "20" app/views/users/welcome_photo.html.haml @@ -901,8 +901,10 @@ fr: photo_message: "Votre photo de profil vous représente sur {{site}}. Vous pourrez la modifier plus tard." #en: photo_was_successfully_created: Photo was successfully created. photo_was_successfully_created: Votre photo a été ajoutée avec succès. - #en: photos: {{count}} Photos - photos: + #en: photos: Photos + photos: Photos + #en: plural_photos: {{count}} Photos + plural_photos: one: 1 Photo other: "{{count}} Photos" #en: photos_should_be_x_pixels: Photos should be 300x300 pixels. lang/ui/fr-FR.yml lang/base.yml lang/readme.txt lang/ui/en-US.yml bdbc2c449b90be404e04557baa2eee9c9b04430f bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/240c3276b4743f216557e7602ecaf2d0417b25c9 240c3276b4743f216557e7602ecaf2d0417b25c9 2009-10-23T18:10:11-07:00 2009-10-23T18:10:11-07:00 cleaning up en.yml 9e9041bce5282faa3f338721113f0589777bfc56 bborn bruno.bornsztein@gmail.com