[MKDoc-commit] Vairous i18n bux fixes

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Tue Nov 30 15:07:09 GMT 2004


Log Message:
-----------
Vairous i18n bux fixes

Modified Files:
--------------
    mkd/resources/templates/admin/audience_list:
        en.html
    mkd/resources/templates/admin/component_move:
        en.html
    mkd/resources/templates/admin/new:
        en.html
    mkd/resources/templates/admin/properties:
        en.html
    mkd/resources/templates/admin/sort:
        en.html
    mkd/resources/templates/error:
        en.html
    mkd/resources/templates/macros/menu_admin:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/audience_list/en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lresources/templates/admin/audience_list/en.html -Lresources/templates/admin/audience_list/en.html -u -r1.9 -r1.10
--- resources/templates/admin/audience_list/en.html
+++ resources/templates/admin/audience_list/en.html
@@ -197,6 +197,9 @@
         No audiences have been created yet, if you would like to create one 
         then use the 
         <a
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
           href="../audience_insert/en.html"
           petal:attributes="href audience_add/uri"
           i18n:attributes="lang     two-letter-language-code;
@@ -219,6 +222,9 @@
       >
         You may 
         <a
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
           href="../audience_insert/en.html"
           petal:attributes="href audience_add/uri"
           i18n:attributes="lang     two-letter-language-code;
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/component_move/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/component_move/en.html -Lresources/templates/admin/component_move/en.html -u -r1.7 -r1.8
--- resources/templates/admin/component_move/en.html
+++ resources/templates/admin/component_move/en.html
@@ -228,7 +228,7 @@
           i18n:attributes="lang     two-letter-language-code;
                            xml:lang two-letter-language-code;
                            dir      text-direction;"
-          i18n:translate="move-component"
+          i18n:translate="copy-component"
         >
           Copy Component
         </em>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/new/en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lresources/templates/admin/new/en.html -Lresources/templates/admin/new/en.html -u -r1.13 -r1.14
--- resources/templates/admin/new/en.html
+++ resources/templates/admin/new/en.html
@@ -577,7 +577,7 @@
               i18n:attributes="lang     two-letter-language-code;
                                xml:lang two-letter-language-code;
                                dir      text-direction;"
-              i18n:translate="title"
+              i18n:translate="publisher"
             >Publisher</label>
             <em
               lang="en"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/properties/en.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lresources/templates/admin/properties/en.html -Lresources/templates/admin/properties/en.html -u -r1.12 -r1.13
--- resources/templates/admin/properties/en.html
+++ resources/templates/admin/properties/en.html
@@ -299,6 +299,8 @@
           >
             <label
               for="name"
+              lang="en"
+              xml:lang="en"
               dir="ltr"
               class="mandatory"
               i18n:attributes="lang     two-letter-language-code;
@@ -627,7 +629,7 @@
               i18n:attributes="lang     two-letter-language-code;
                                xml:lang two-letter-language-code;
                                dir      text-direction;"
-              i18n:translate="title"
+              i18n:translate="publisher"
             >Publisher</label>
             <em
               lang="en"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/sort/en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lresources/templates/admin/sort/en.html -Lresources/templates/admin/sort/en.html -u -r1.10 -r1.11
--- resources/templates/admin/sort/en.html
+++ resources/templates/admin/sort/en.html
@@ -243,14 +243,7 @@
       <p>
         <a 
           href="#"
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
           petal:attributes="href self/uri_by_title"
-          i18n:attributes="lang     two-letter-language-code;
-                           xml:lang two-letter-language-code;
-                           dir      text-direction;"
-          i18n:translate="title"
           petal:omit-tag="true: self/is_sort_by --title"
         ><span
            lang="en"
@@ -261,7 +254,6 @@
                             xml:lang two-letter-language-code;
                             dir      text-direction;"
            i18n:translate="title"
-           petal:omit-tag="false: self/is_sort_by --title"
          >Title</span></a>
         <bdo 
           dir="ltr"
@@ -270,14 +262,7 @@
         >|</bdo>
         <a 
           href="#"
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
           petal:attributes="href self/uri_by_date_created"
-          i18n:attributes="lang     two-letter-language-code;
-                           xml:lang two-letter-language-code;
-                           dir      text-direction;"
-          i18n:translate="creation-date"
           petal:omit-tag="true: self/is_sort_by --date_created"
         ><span
            lang="en"
@@ -287,7 +272,6 @@
                             xml:lang two-letter-language-code;
                             dir      text-direction;"
            i18n:translate="creation-date"
-           petal:omit-tag="false: self/is_sort_by --date_created"
          >Creation Date</span></a> 
         <bdo 
           dir="ltr"
@@ -296,20 +280,12 @@
         >|</bdo>
         <a 
           href="#"
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
-          petal:omit-tag="true: self/is_sort_by --date_last_modified"
-          i18n:attributes="lang     two-letter-language-code;
-                           xml:lang two-letter-language-code;
-                           dir      text-direction;"
-          i18n:translate="last-modification-date"
           petal:attributes="href self/uri_by_date_last_modified"
+          petal:omit-tag="true: self/is_sort_by --date_last_modified"
         ><span 
            lang="en"
            xml:lang="en"
            dir="ltr"
-           petal:omit-tag="false: self/is_sort_by --date_last_modified"
            i18n:attributes="lang     two-letter-language-code;
                             xml:lang two-letter-language-code;
                             dir      text-direction;"
@@ -322,20 +298,12 @@
         >|</bdo>
         <a 
           href="#"
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
-          petal:omit-tag="true: self/is_sort_by --position"
-          i18n:attributes="lang     two-letter-language-code;
-                           xml:lang two-letter-language-code;
-                           dir      text-direction;"
-          i18n:translate="manual-order"
           petal:attributes="href self/uri_by_position"
+          petal:omit-tag="true: self/is_sort_by --position"
         ><span
            lang="en"
            xml:lang="en"
            dir="ltr"
-           petal:omit-tag="false: self/is_sort_by --position"
            i18n:attributes="lang     two-letter-language-code;
                             xml:lang two-letter-language-code;
                             dir      text-direction;"
@@ -548,7 +516,7 @@
                                       xml:lang two-letter-language-code;
                                       dir      text-direction;
                                       title    move-this-document-down"
-                     i18n:translate="move-document-down"
+                     i18n:translate="move-document-name-down"
                      petal:condition="true: self/move_down_uri child"
                    >Move
                      <em
@@ -573,7 +541,7 @@
                                       xml:lang two-letter-language-code;
                                       dir      text-direction;
                                       title    move-this-document-up"
-                     i18n:translate="move-document-up"
+                     i18n:translate="move-document-name-up"
                      petal:condition="true: self/move_up_uri child"
                   >Move
                     <em
@@ -638,7 +606,7 @@
                                       xml:lang two-letter-language-code;
                                       dir      text-direction;
                                       title    move-this-document-down"
-                     i18n:translate="move-document-down"
+                     i18n:translate="move-document-name-down"
                      petal:condition="true: self/move_down_uri child"
                    >Move
                      <em
@@ -663,7 +631,7 @@
                                       xml:lang two-letter-language-code;
                                       dir      text-direction;
                                       title    move-this-document-up"
-                     i18n:translate="move-document-up"
+                     i18n:translate="move-document-name-up"
                      petal:condition="true: self/move_up_uri child"
                   >Move
                     <em
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/error/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/error/en.html -Lresources/templates/error/en.html -u -r1.4 -r1.5
--- resources/templates/error/en.html
+++ resources/templates/error/en.html
@@ -256,7 +256,7 @@
         i18n:translate="error-document-copy-parent-is-self"
         petal:condition="error/is --document/copy/no_target"
       >
-        BUG: You must select a valid document to copy to.
+        You cannot copy a document into itself!
       </li>
  
       <li 
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/macros/menu_admin/en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lresources/templates/macros/menu_admin/en.html -Lresources/templates/macros/menu_admin/en.html -u -r1.9 -r1.10
--- resources/templates/macros/menu_admin/en.html
+++ resources/templates/macros/menu_admin/en.html
@@ -181,7 +181,6 @@
        name="admin-menu-add-audience"
        petal:attributes="href audience_add/uri"
        i18n:attributes="title add-audience-title"
-       i18n:translate="add-audience"
        petal:omit-tag="false: audience_add/would_activate"
      ><span
         xml:lang="en"
@@ -272,7 +271,6 @@
          name="admin-menu-properties"
          petal:attributes="href edit_properties_uri"
          i18n:attributes="title properties-title"
-         i18n:translate="properties"
          petal:omit-tag="false: properties/would_activate"
        ><span
           xml:lang="en"
@@ -301,7 +299,6 @@
          name="admin-menu-content"
          petal:attributes="href edit_content_uri"
          i18n:attributes="title content-title"
-         i18n:translate="content"
          petal:omit-tag="false: content/would_activate"
        ><span
           xml:lang="en"
@@ -329,7 +326,6 @@
         title="Find documents"
         petal:attributes="href finder_uri"
         i18n:attributes="title finder-title"
-        i18n:translate="finder"
         petal:omit-tag="false: finder/would_activate"
       ><span
          xml:lang="en"
@@ -446,7 +442,6 @@
          name="admin-menu-new"  
          petal:attributes="href edit_new_uri"
          i18n:attributes="title new-title"
-         i18n:translate="new"
          petal:omit-tag="false: new/would_activate"
        ><span 
          xml:lang="en"


More information about the MKDoc-commit mailing list