Remove interpolation from translatable strings

Also added test/unit/i18n_test.rb which will warn us if any others pop up.

Remove interpolation from translatable strings
Also added test/unit/i18n_test.rb which will warn us if any others pop up.
Antonio Terceiro
1 parent 91eaaa66
Showing 13 changed files with 42 additions and 15 deletions Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
app/views/content_viewer/article_versions.html.erb
app/views/profile_roles/destroy.html.erb
app/views/profile_roles/edit.html.erb
app/views/role/edit.html.erb
app/views/shared/_content_item.html.erb
lib/tasks/gettext.rake
plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
plugins/sub_organizations/lib/related_organizations_block.rb
plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.html.erb
plugins/sub_organizations/views/sub_organizations_plugin_profile/_related_organizations.html.erb
test/unit/i18n_test.rb
@@ -109,7 +109,7 @@ class ProfileEditorController &lt; MyProfileController
       profile = environment.profiles.find(params[:id])
       if profile.disable
         profile.save
-        session[:notice] = _("The profile '#{profile.name}' was deactivated.")
+        session[:notice] = _("The profile '%s' was deactivated.") % profile.name
       else
         session[:notice] = _('Could not deactivate profile.')
       end
@@ -123,7 +123,7 @@ class ProfileEditorController &lt; MyProfileController
       profile = environment.profiles.find(params[:id])
       if profile.enable
-        session[:notice] = _("The profile '#{profile.name}' was activated.")
+        session[:notice] = _("The profile '%s' was activated.") % profile.name
       else
         session[:notice] = _('Could not activate the profile.')
       end
@@ -12,7 +12,7 @@
       <li>
         <%= radio_button_tag 'v1', v.version, false, :onclick => 'versionInputClicked(this)' %>
         <%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
-        <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+        <%= link_to(_("Version %s") % v.version, @page.url.merge(:version => v.version)) %>
         <%= @page.version == v.version ? _('(current)') : '' %>
         <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
         <span class='updated-on'><%= show_time(v.updated_at) %></span>
-<h1> <%= _("Deleting #{@role.name}") %> </h1>
+<h1> <%= _("Deleting %s") % @role.name %> </h1>
 <% if @members.nil? || @members.empty? %>
   <p><%= _('This role is not being currently used.')%></p>
-<h1> <%= _("Editing #{@role.name}") %> </h1>
+<h1> <%= _("Editing %s") % @role.name %> </h1>
 <%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => [@role.kind] } %>
-<h2> <%= _("Editing #{@role.name}") %> </h2>
+<h2> <%= _("Editing %s") % @role.name %> </h2>
 <%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
@@ -6,6 +6,6 @@
     <span class="item-description">
       <%= link_to(content.name, content.url) %>
     </span>
-    <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
+    <span class="item-date"><%= _("Published at: %s") % show_date(content.updated_at) %></span>
   </div>
 </div>
@@ -60,6 +60,8 @@ task :updatepo do
   puts 'Extracting strings from source. This may take a while ...'
+  # XXX this list is duplicated in test/unit/i18n_test.rb; if you change it
+  # here, please also update it there.
   files_to_translate = [
     "{app,lib}/**/*.{rb,rhtml,erb}",
     'config/initializers/*.rb',
@@ -29,7 +29,7 @@ class OauthClientPluginPublicController &lt; PublicController
     if user_provider.enabled? && provider.enabled?
       session[:user] = user.id
     else
-      session[:notice] = _("Can't login with #{provider.name}")
+      session[:notice] = _("Can't login with %s") % provider.name
     end
     redirect_to :controller => :account, :action => :login
@@ -6,7 +6,7 @@
 <main role="main">
   <p class="h4">
-  <%= _('Authorize %s to use your account?' % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>") %>
+  <%= _('Authorize %s to use your account?') % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>" %>
   </p>
   <% if @pre_auth.scopes %>
@@ -24,7 +24,7 @@ class RelatedOrganizationsBlock &lt; ProfileListBlock
   end
   def help
-    _("This block displays #{display_type[:title]} organizations of this organization")
+    _("This block displays %s organizations of this organization") % display_type[:title]
   end
   def profiles
 <% extend SubOrganizationsPlugin::SearchHelper %>
 <div class="related-organizations-list-block">
-  <h1><%= _("#{profile.name}'s sub-#{organization_type.pluralize}") %></h1>
+  <h1><%= _("%s's sub-%s") % [profile.name, organization_type.pluralize] %></h1>
   <ul>
   <% organizations.each do |organization| %>
     <li class="related-organizations-item">
@@ -53,7 +53,7 @@
   <% button_bar(:class => "related-organizations-button-bar") do %>
     <%= button :back, c_('Go back'), { :controller => 'profile' } %>
-    <%= button :add, _("Add a new #{organization_type}"), :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
+    <%= button :add, _("Add a new %s") % organization_type, :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
     <% if !@full %>
       <%= button :more, c_('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
 <div class="common-profile-list-block">
-  <h1><%= _("#{profile.name}'s sub-#{organization_type.pluralize}") %></h1>
+  <h1><%= _("%s's sub-%s") % [profile.name, organization_type.pluralize] %></h1>
   <ul class='profile-list'>
     <% organizations.each do |organization| %>
@@ -7,11 +7,11 @@
     <% end %>
   </ul>
   <% if organizations.length == 0 %>
-    <li><%= _("There are no sub-#{organization_type.pluralize} yet. " )  %></li>
+    <li><%= _("There are no sub-%s yet.")  % organization_type.pluralize %></li>
   <% end %>
   <% button_bar(:class => "related-organizations-button-bar") do %>
     <%= button :back, c_('Go back'), { :controller => 'profile' } %>
-    <%= button :add, _("Add a new #{organization_type}"), :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
+    <%= button :add, _("Add a new %s") % organization_type, :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
     <% if !@full %>
       <%= button :more, c_('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
@@ -0,0 +1,25 @@
+require_relative "../test_helper"
+
+class I18nTest < ActiveSupport::TestCase
+
+  # XXX this duplicates the list from lib/tasks/gettext.rake
+  files_to_translate = [
+    "{app,lib}/**/*.{rb,rhtml,erb}",
+    'config/initializers/*.rb',
+    'public/*.html.erb',
+    'public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}',
+  ].map { |pattern| Dir.glob(pattern) }.flatten
+
+  plugins_files_to_translate = Dir.glob("plugins/**/*.{rb,html.erb}")
+
+  (files_to_translate + plugins_files_to_translate).each do |f|
+    test "translation marks in #{f}" do
+      lines = File.readlines(f).select do |line|
+        line =~ /\b_\(["'][^)]*#\{/
+      end
+      assert lines == [], "found interpolation in translatable strings:\n" + lines.join("\n")
+    end
+  end
+
+end
+
	@@ -109,7 +109,7 @@ class ProfileEditorController < MyProfileController		@@ -109,7 +109,7 @@ class ProfileEditorController < MyProfileController
109	profile = environment.profiles.find(params[:id])	109	profile = environment.profiles.find(params[:id])
110	if profile.disable	110	if profile.disable
111	profile.save	111	profile.save
112	- session[:notice] = _("The profile '#{profile.name}' was deactivated.")	112	+ session[:notice] = _("The profile '%s' was deactivated.") % profile.name
113	else	113	else
114	session[:notice] = _('Could not deactivate profile.')	114	session[:notice] = _('Could not deactivate profile.')
115	end	115	end
	@@ -123,7 +123,7 @@ class ProfileEditorController < MyProfileController		@@ -123,7 +123,7 @@ class ProfileEditorController < MyProfileController
123	profile = environment.profiles.find(params[:id])	123	profile = environment.profiles.find(params[:id])
124		124
125	if profile.enable	125	if profile.enable
126	- session[:notice] = _("The profile '#{profile.name}' was activated.")	126	+ session[:notice] = _("The profile '%s' was activated.") % profile.name
127	else	127	else
128	session[:notice] = _('Could not activate the profile.')	128	session[:notice] = _('Could not activate the profile.')
129	end	129	end
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<li>	12	<li>
13	<%= radio_button_tag 'v1', v.version, false, :onclick => 'versionInputClicked(this)' %>	13	<%= radio_button_tag 'v1', v.version, false, :onclick => 'versionInputClicked(this)' %>
14	<%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>	14	<%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
15	- <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>	15	+ <%= link_to(_("Version %s") % v.version, @page.url.merge(:version => v.version)) %>
16	<%= @page.version == v.version ? _('(current)') : '' %>	16	<%= @page.version == v.version ? _('(current)') : '' %>
17	<span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>	17	<span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
18	<span class='updated-on'><%= show_time(v.updated_at) %></span>	18	<span class='updated-on'><%= show_time(v.updated_at) %></span>
1	-<h1> <%= _("Deleting #{@role.name}") %> </h1>	1	+<h1> <%= _("Deleting %s") % @role.name %> </h1>
2		2
3	<% if @members.nil? \|\| @members.empty? %>	3	<% if @members.nil? \|\| @members.empty? %>
4	<p><%= _('This role is not being currently used.')%></p>	4	<p><%= _('This role is not being currently used.')%></p>
1	-<h1> <%= _("Editing #{@role.name}") %> </h1>	1	+<h1> <%= _("Editing %s") % @role.name %> </h1>
2		2
3	<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => [@role.kind] } %>	3	<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => [@role.kind] } %>
1	-<h2> <%= _("Editing #{@role.name}") %> </h2>	1	+<h2> <%= _("Editing %s") % @role.name %> </h2>
2		2
3	<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>	3	<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
	@@ -6,6 +6,6 @@		@@ -6,6 +6,6 @@
6	<span class="item-description">	6	<span class="item-description">
7	<%= link_to(content.name, content.url) %>	7	<%= link_to(content.name, content.url) %>
8	</span>	8	</span>
9	- <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>	9	+ <span class="item-date"><%= _("Published at: %s") % show_date(content.updated_at) %></span>
10	</div>	10	</div>
11	</div>	11	</div>
	@@ -60,6 +60,8 @@ task :updatepo do		@@ -60,6 +60,8 @@ task :updatepo do
60		60
61	puts 'Extracting strings from source. This may take a while ...'	61	puts 'Extracting strings from source. This may take a while ...'
62		62
		63	+ # XXX this list is duplicated in test/unit/i18n_test.rb; if you change it
		64	+ # here, please also update it there.
63	files_to_translate = [	65	files_to_translate = [
64	"{app,lib}/*/.{rb,rhtml,erb}",	66	"{app,lib}/*/.{rb,rhtml,erb}",
65	'config/initializers/*.rb',	67	'config/initializers/*.rb',
	@@ -29,7 +29,7 @@ class OauthClientPluginPublicController < PublicController		@@ -29,7 +29,7 @@ class OauthClientPluginPublicController < PublicController
29	if user_provider.enabled? && provider.enabled?	29	if user_provider.enabled? && provider.enabled?
30	session[:user] = user.id	30	session[:user] = user.id
31	else	31	else
32	- session[:notice] = _("Can't login with #{provider.name}")	32	+ session[:notice] = _("Can't login with %s") % provider.name
33	end	33	end
34		34
35	redirect_to :controller => :account, :action => :login	35	redirect_to :controller => :account, :action => :login
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6		6
7	<main role="main">	7	<main role="main">
8	<p class="h4">	8	<p class="h4">
9	- <%= _('Authorize %s to use your account?' % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>") %>	9	+ <%= _('Authorize %s to use your account?') % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>" %>
10	</p>	10	</p>
11		11
12	<% if @pre_auth.scopes %>	12	<% if @pre_auth.scopes %>
	@@ -24,7 +24,7 @@ class RelatedOrganizationsBlock < ProfileListBlock		@@ -24,7 +24,7 @@ class RelatedOrganizationsBlock < ProfileListBlock
24	end	24	end
25		25
26	def help	26	def help
27	- _("This block displays #{display_type[:title]} organizations of this organization")	27	+ _("This block displays %s organizations of this organization") % display_type[:title]
28	end	28	end
29		29
30	def profiles	30	def profiles