Make hardcoded strings translatable.

Wraps previously hardcoded strings in {ts} in Smarty .tpl files.

diff --git a/templates/CRM/Activity/Form/Task/PickOption.tpl b/templates/CRM/Activity/Form/Task/PickOption.tpl
index d9581ffedb3c41c2826f21cb6875f9a556658939..a2167dddcad2ed67d0306e3be90904645841b16c 100644 (file)
--- a/templates/CRM/Activity/Form/Task/PickOption.tpl
+++ b/templates/CRM/Activity/Form/Task/PickOption.tpl
@@ -9,7 +9,7 @@
 *}
 <div class="crm-form crm-form-block crm-pick-option-form-block">
 <div class="help">
-   Select Group of Contacts
+   {ts}Select Group of Contacts{/ts}
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    <table class="form-layout-compressed">

diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl
index 4199bade944b055708717d45f3452e72d1a1e59c..41bf07769ddb6c1511653e4c6f48ef1a101346b0 100644 (file)
--- a/templates/CRM/Admin/Page/JobLog.tpl
+++ b/templates/CRM/Admin/Page/JobLog.tpl
@@ -41,8 +41,8 @@
             <td class="crm-joblog-name">{$row.name}</td>
             <td class="crm-joblog-details">
                 <div class="crm-joblog-command">{$row.command}</div>
-                {if $row.description}<div class="crm-joblog-description"><span class="bold">Summary</span><br/>{$row.description}</div>{/if}
-              {if $row.data}<div class="crm-joblog-data" style="border-top:1px solid #ccc; margin-top: 10px;"><span class="bold">Details</span><br/><pre>{$row.data}</pre></div>{/if}
+                {if $row.description}<div class="crm-joblog-description"><span class="bold">{ts}Summary{/ts}</span><br/>{$row.description}</div>{/if}
+                {if $row.data}<div class="crm-joblog-data" style="border-top:1px solid #ccc; margin-top: 10px;"><span class="bold">{ts}Details{/ts}</span><br/><pre>{$row.data}</pre></div>{/if}
             </td>
         </tr>
         {/foreach}

diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index 7bc7ac1e23fdf5f718c165e9feffe91b579187e3..37b587d765c36cf3718da8bab27168ef821d6c1a 100644 (file)
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -28,7 +28,7 @@
       <textarea name="msg-subject" id="msg_subject" style="height: 6em; width: 45em;">{$form.msg_subject.value}</textarea>
       <div class='spacer'></div>
       <div class="section">
-        <a href='#' onclick='MessageTemplates.msg_subject.select(); return false;' class='button'><span>Select Subject</span></a>
+        <a href='#' onclick='MessageTemplates.msg_subject.select(); return false;' class='button'><span>{ts}Select Subject{/ts}</span></a>
         <div class='spacer'></div>
       </div>
     </div>
@@ -40,7 +40,7 @@
       <textarea class="huge" name='msg_text' id='msg_text'>{$form.msg_text.value|htmlentities}</textarea>
       <div class='spacer'></div>
       <div class="section">
-        <a href='#' onclick='MessageTemplates.msg_text.select(); return false;' class='button'><span>Select Text Message</span></a>
+        <a href='#' onclick='MessageTemplates.msg_text.select(); return false;' class='button'><span>{ts}Select Text Message{/ts}</span></a>
         <div class='spacer'></div>
       </div>
     </div>
@@ -52,7 +52,7 @@
       <textarea class="huge" name='msg_html' id='msg_html'>{$form.msg_html.value|htmlentities}</textarea>
       <div class='spacer'></div>
       <div class="section">
-        <a href='#' onclick='MessageTemplates.msg_html.select(); return false;' class='button'><span>Select HTML Message</span></a>
+        <a href='#' onclick='MessageTemplates.msg_html.select(); return false;' class='button'><span>{ts}Select HTML Message{/ts}</span></a>
         <div class='spacer'></div>
       </div>
     </div>

diff --git a/templates/CRM/Contact/Form/Task/ProximityCommon.tpl b/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
index bce164c9ff3cc2d891e9ffef9bdbf3bc26533bf5..246f94f941823aca96a6764817613f6c0f355062 100644 (file)
--- a/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
@@ -11,7 +11,7 @@
     <legend>{ts}By Distance from a Location{/ts}</legend>
     <table class="form-layout-compressed">
        <tr><td class="label">{$form.prox_distance.label}</td><td>{$form.prox_distance.html|crmAddClass:four} {$form.prox_distance_unit.html}</td></tr>
-       <tr><td class="label">FROM...</td><td></td></tr>
+       <tr><td class="label">{ts}FROM...{/ts}</td><td></td></tr>
        <tr><td class="label">{$form.prox_street_address.label}</td><td>{$form.prox_street_address.html}</td></tr>
        <tr><td class="label">{$form.prox_city.label}</td><td>{$form.prox_city.html}</td></tr>
        <tr><td class="label">{$form.prox_postal_code.label}</td><td>{$form.prox_postal_code.html}</td></tr>

diff --git a/templates/CRM/Contact/Import/Form/Mapper.tpl b/templates/CRM/Contact/Import/Form/Mapper.tpl
index e5529d9b7d9b701c11dc7ad0ad892a7d3b7d69e7..cc726d4496180cd2f75bf09e67f635fc91b59e4b 100644 (file)
--- a/templates/CRM/Contact/Import/Form/Mapper.tpl
+++ b/templates/CRM/Contact/Import/Form/Mapper.tpl
@@ -9,7 +9,7 @@
 *}
 <div class="crm-block crm-form-block">
 
-<h3>Mapper - 4 Selectors</h3>
+<h3>{ts}Mapper - 4 Selectors{/ts}</h3>
 
 <div class="form-item">
    <dl>

diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index 395155e9fa3f6102e6c80b3d06f3bf46400f5462..2cffd1e82f0394a4e666537debc4977df1ec57fa 100644 (file)
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -21,7 +21,7 @@
     {* display current relationships *}
     <h3>{ts}Current Relationships{/ts}</h3>
     <div id="permission-legend" class="help">
-      <span class="crm-label">Permissioned Relationships: </span>
+      <span class="crm-label">{ts}Permissioned Relationships: {/ts}</span>
       {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=1 afterText=true}
     </div>
     {include file="CRM/Contact/Page/View/RelationshipSelector.tpl" context="current"}

diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index 7b2a6040fa1a30c39a0c3be1eebc4378ec7761d3..ae52293301ca05005e4c486b1ef4b6d3bc832880 100644 (file)
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -25,7 +25,7 @@
       {else}
         <tr><td class="label">{ts}Amount{/ts}</td><td>{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if}</td></tr>
       {/if}
-      <tr><td class="label">{ts}Frequency{/ts}</td><td>every {$recur.frequency_interval} {$recur.frequency_unit}</td></tr>
+      <tr><td class="label">{ts}Frequency{/ts}</td><td>{ts 1=$recur.frequency_interval 2=$recur.frequency_unit}every %1 %2{/ts}</td></tr>
       {if !empty($recur.installments)}<tr><td class="label">{ts}Installments{/ts}</td><td>{$recur.installments}</td></tr>{/if}
       <tr><td class="label">{ts}Status{/ts}</td><td>{$recur.contribution_status}</td></tr>
       <tr><td class="label">{ts}Start Date{/ts}</td><td>{$recur.start_date|crmDate}</td></tr>

diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index f91c883be3b426a274885a2a8937905c2c70b88d..5f89ee8a6d900f2dea9c928e41eacd204f015bc5 100644 (file)
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -81,7 +81,7 @@ CRM.$(function($) {
 
 {/literal}
 </script>
-<h3>Change Registration Selections</h3>
+<h3>{ts}Change Registration Selections{/ts}</h3>
 
 <div class="crm-block crm-form-block crm-payment-form-block">
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>

diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl
index 967498961e96872ac7c280555b3bdd72fe48b311..52ca891e9d35ec3a5315dbf13b418d7257c85020 100644 (file)
--- a/templates/CRM/Group/Form/Edit.tpl
+++ b/templates/CRM/Group/Form/Edit.tpl
@@ -31,7 +31,7 @@
       <td>{$form.description.html}</td>
     </tr>
 
-    <tr><td colspan="2">If either of the following fields are filled out they will be used instead of the title or description field in profiles and Mailing List Subscription/unsubscribe forms</td></tr>
+    <tr><td colspan="2">{ts}If either of the following fields are filled out they will be used instead of the title or description field in profiles and Mailing List Subscription/unsubscribe forms{/ts}</td></tr>
 
     <tr class="crm-group-form-block-frontend-title">
       <td class="label">{$form.frontend_title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_group' field='frontend_title' id=$group.id}{/if}</td>

diff --git a/templates/CRM/Mailing/Form/ForwardMailing.tpl b/templates/CRM/Mailing/Form/ForwardMailing.tpl
index 4e7ba414cf7333bff5dc4f62081c893d426de535..64a1979b99ef789f065a15a85b29e7ff25f609ef 100644 (file)
--- a/templates/CRM/Mailing/Form/ForwardMailing.tpl
+++ b/templates/CRM/Mailing/Form/ForwardMailing.tpl
@@ -9,7 +9,7 @@
 *}
 <div class="crm-block crm-mailing-forward-form-block">
 <table class="form-layout">
-<tr class="crm-mailing-forward-form-block-fromEmail"><td class="label">From</td><td>{$fromEmail}</td></tr>
+<tr class="crm-mailing-forward-form-block-fromEmail"><td class="label">{ts}From{/ts}</td><td>{$fromEmail}</td></tr>
 <tr><td colspan="2">{ts}Please enter up to 5 email addresses to receive the mailing.{/ts}</td></tr>
 <tr class="crm-mailing-forward-form-block-email_0"><td class="label" >{$form.email_0.label}</td><td>{$form.email_0.html}</td></tr>
 <tr class="crm-mailing-forward-form-block-email_1"><td class="label" >{$form.email_1.label}</td><td>{$form.email_1.html}</td></tr>

diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl
index 3618df6e0a6eb7b20c1199e279cd9244c8c1fbfa..95d0be22edf402b54df79cb130d028dcf1482b6d 100644 (file)
--- a/templates/CRM/Report/Page/InstanceList.tpl
+++ b/templates/CRM/Report/Page/InstanceList.tpl
@@ -33,7 +33,7 @@
                     <td class="crm-report-instanceList-description">{$row.description}</td>
                     <td>
                     <a href="{$row.viewUrl}" class="action-item crm-hover-button">{ts}View Results{/ts}</a>
-                    <span class="btn-slide crm-hover-button">more
+                    <span class="btn-slide crm-hover-button">{ts}more{/ts}
                       <ul class="panel">
                         {foreach from=$row.actions item=action key=action_name}
                           <li><a href="{$action.url}" class="{$action_name} action-item crm-hover-button small-popup"

diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index 4fcc269f5d8996bdee58ad156b8e46f9e34ca14c..727c429a2db09fc9c1d0044b0cc89feeb8950812 100644 (file)
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -23,7 +23,7 @@
     <div id="standalone-form">
         <textarea rows="20" cols="80" name="profile" id="profile">{$profile}</textarea>
         <div class="spacer"></div>
-        <a href="#" onclick="html_code.profile.select(); return false;" class="button"><span>Select HTML Code</span></a>
+        <a href="#" onclick="html_code.profile.select(); return false;" class="button"><span>{ts}Select HTML Code{/ts}</span></a>
     </div>
     <div class="action-link">
         &nbsp; <a href="{crmURL p='civicrm/admin/uf/group' q="reset=1"}"><i class="crm-i fa-chevron-left" aria-hidden="true"></i>  {ts}Back to Profile Listings{/ts}</a>

diff --git a/templates/CRM/common/importProgress.tpl b/templates/CRM/common/importProgress.tpl
index 5e7679b27453bf05791b09c6a647c5d3c9004c05..b97889d783ac0910d95edd180bbbe72e26d2c388 100644 (file)
--- a/templates/CRM/common/importProgress.tpl
+++ b/templates/CRM/common/importProgress.tpl
@@ -58,7 +58,7 @@ CRM.$(function($) {
 
 {* Import Progress Bar and Info *}
 <div id="id-processing" class="hiddenElement">
-  <h3>Importing records...</h3><br />
+  <h3>{ts}Importing records...{/ts}</h3><br />
        <div id="status" style="margin-left:6px;"></div>
   <div class="progressBar" id="importProgressBar" style="margin-left:6px;display:none;"></div>
   <div id="intermediate"></div>