[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.5-51-g652bd29

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  652bd29f0b086b5446b50e6842c83cecb7c2138c (commit)
       via  d320b6ce63eb1cf47ed1726124d99c43291f93e4 (commit)
      from  5078cb91244eb52227cbda413fd727ecab4be210 (commit)

Summary of changes:
 share/html/Admin/Articles/Classes/Modify.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit d320b6ce63eb1cf47ed1726124d99c43291f93e4
Author: Kadar Attila <atus at mithrandir.hu>
Date:   Wed Jun 18 15:40:33 2014 +0200

    made all the strings localizeable

diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index 304a8e5..0720323 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -82,7 +82,7 @@
 </tr>
 </table>
 
-<h3>When inserting articles in this class into emails:</h3>
+<h3><&|/l&>When inserting articles in this class into emails:</&></h3>
 <ul>
 <li>
     <input type="checkbox" id="Include-Name" name="Include-Name" value="1" <% $include{Name} %>>
@@ -94,7 +94,7 @@
 </li>
 % if ( $cfs ) {
 % while (my $cf = $cfs->Next) {
-<li>Include custom field '<% $cf->Name %>'
+<li><&|/l, $cf->Name &>Include custom field '[_1]'</&>
   <ul>
     <li>
         <input type="checkbox" id="Include-CF-Title-<% $cf->Id %>" name="Include-CF-Title-<% $cf->Id %>" <% $include{"CF-Title-".$cf->Id} %> />
@@ -110,12 +110,12 @@
 </ul>
 
 % if ( @$subject_cfs ) {
-<h3>Change email subject:</h3>
+<h3><&|/l&>Change email subject:</&></h3>
 <p><&|/l&>If a Custom Field is selected, the Subject of your outgoing email will be overridden by this article.</&></p>
 
 <& /Widgets/Form/Select,
     Name         => 'SubjectOverride',
-    DefaultLabel => 'No Subject Override',
+    DefaultLabel => loc('No Subject Override'),
     Values       => $subject_cfs,
     ValuesLabel  => $subject_cf_labels,
     CurrentValue => $ClassObj->SubjectOverride,

commit 652bd29f0b086b5446b50e6842c83cecb7c2138c
Merge: 5078cb9 d320b6c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jun 19 14:45:25 2014 -0400

    Merge branch '4.2/articles-admin-loc' into 4.2-trunk


-----------------------------------------------------------------------