Merge pull request #920 from camillem/master

Adding notranslate classes to ease translation of dynamic text

TRANSLATION.md

@@ -51,3 +51,9 @@ You can view OSEM in other languages by selecting the language you want from the
         autocollect: true
       };
 ```
+## 5. Strings with dynamic contents
+
+Strings containing dynamic content should be tagged in the haml file with "notranslate" classes as described in:
+
+http://docs.transifex.com/live/webmasters/#how-to-handle-inline-block-variables
+

app/views/conference/_call_for_paper.html.haml

@@ -14,23 +14,26 @@
       %p
         - if @program.event_types.any?
           You can submit proposals for
-          = "#{event_types(@conference)}."
+          %span.notranslate
+            = "#{event_types(@conference)}."
         - if @program.tracks.any?
           Proposals should fit in one of the
-          = "#{pluralize(@program.tracks.count, 'track')}:"
+          %span.notranslate
-          = "#{tracks(@conference)}."
+            = "#{pluralize(@program.tracks.count, 'track')}:"
+            = "#{tracks(@conference)}."
         The submission period has begun
-        %em
+        %em.notranslate
           = @program.cfp.start_date.strftime('%A, %B %-d. %Y')
         and closes
-        %em
+        %em.notranslate
           = @program.cfp.end_date.strftime('%A, %B %-d. %Y.')
         - if @program.cfp_open?
           That means you have only
-          %b= pluralize(@program.cfp.remaining_days, 'day')
+          %b.notranslate= pluralize(@program.cfp.remaining_days, 'day')
           left!
           Remember
-          = @conference.short_title
+          %span.notranslate
+            = @conference.short_title
           will only be as good as the sessions you present. Submit early, submit often!
         - else
           The submission period is closed.

app/views/conference/_schedule_splashpage.html.haml

@@ -4,7 +4,8 @@
       %h2.text-center
         Program
       %p.lead.text-center
-        = @conference.short_title
+        %span.notranslate
+          = @conference.short_title
         has the most awesome program ever!
         - if @conference.splashpage and @conference.program.tracks.any? and @conference.splashpage.include_tracks
           See rock-star speakers cover the topics of

app/views/conference/_sponsors.html.haml

@@ -8,7 +8,8 @@
       %h2 Sponsors
       %p.lead
         whom without,
-        = @conference.short_title
+        %span.notranslate
+          = @conference.short_title
         wouldn't be possible! 
   - @conference.sponsorship_levels.each do |sponsorship_level|
     -if sponsorship_level.sponsors.any?

app/views/conference/index.html.haml

@@ -11,7 +11,8 @@
         %p.text-right
           %button{ type: 'button', class: 'btn btn-link btn-sm', 'data-toggle' => 'collapse', 'data-target' => '#antiquated', 'aria-expanded' => 'true', 'aria-controls' => 'antiquated'}
             Older conferences
-            = "(#{@antiquated.count})"
+            %span.notranslate
+              = "(#{@antiquated.count})"
             %i.fa.fa-chevron-right
             %i.fa.fa-chevron-down{ style: 'display: none' }
     #antiquated.collapse

app/views/layouts/_user_menu.html.haml

@@ -37,7 +37,8 @@
         = link_to(admin_conference_path(@conference.short_title)) do
           %span.fa.fa-cog
           Manage
-          = @conference.short_title
+          %span.notranslate
+            = @conference.short_title
 - if can? :manage, User.new
   %li
     = link_to(admin_users_path) do

app/views/proposal/_encouragement_text.html.haml

@@ -8,16 +8,17 @@
     = "#{tracks(@conference)}."
   - if @program.cfp_open?
     The submission period has begun
-    %em
+    %em.notranslate
       = @program.cfp.start_date.strftime('%A, %B %-d. %Y')
     and closes
-    %em
+    %em.notranslate
       = @program.cfp.end_date.strftime('%A, %B %-d. %Y.')
     That means you have
-    %b= pluralize(@program.cfp.remaining_days, 'day')
+    %b.notranslate= pluralize(@program.cfp.remaining_days, 'day')
     left!
     Remember
-    = @conference.title
+    %span.notranslate
+      = @conference.title
     will only be as good as the content you present. Submit early, submit often!
   -else
     The submission period is closed now.

app/views/proposal/index.html.haml

@@ -2,7 +2,9 @@
   .row
     .col-md-12.page-header
       %h1
-        = "My Proposals for #{@conference.title}"
+        Proposals for 
+        %span.notranslate
+          = @conference.title
 
   .row
     .col-md-12