[open-ils-commits] [GIT] Evergreen ILS branch master updated. 7a08ca1430d29db1c6b542c06fc1bd368cb18078

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  7a08ca1430d29db1c6b542c06fc1bd368cb18078 (commit)
      from  7093bd942640cd486bc57d9fa425560e4ec9f534 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7a08ca1430d29db1c6b542c06fc1bd368cb18078
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Feb 1 14:39:23 2013 -0500

    Standardize on 'My' for user pronoun labels
    
    The TPAC currently uses a mish-mash of 'My' and 'Your' when
    labeling user elements (e.g. 'my list', 'your account', etc.).
    This commit settles on the use of 'My', but only for labels, not
    for "dialog" (e.g. 'Your payment has been approved') or for
    imperative statements (e.g. 'Please change your password'). One
    text which is borderline is 'Log in to Your Account', but I
    decided to treat it as imperative and leave it alone for now.
    
    This commit also changes a heading on the list page which was
    lacking title case, as the rest of the interface uses title
    case for all headings.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    
    Conflicts:
    	Open-ILS/src/templates/opac/myopac/lists.tt2

diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 52e0689..5347d34 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -9,7 +9,7 @@
 
     <!-- new list creation -->
     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
-        <h1>[% l('Create new list') %]</h1><a name="createnewlist"></a>
+        <h1>[% l('Create New List') %]</h1><a name="createnewlist"></a>
         <table cellpadding="0" border="0" id="list_create_table">
             <tr>
                 <td>
@@ -58,7 +58,7 @@
         </table>
     </form>
 
-    <h1>[% l("Your existing lists") %]</h1>
+    <h1>[% l("My Existing Lists") %]</h1>
     [% INCLUDE "opac/parts/anon_list.tt2" %]
     [% IF ctx.bookbags.size %]
     <div class="header_middle">
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index a0be906..30ac614 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -19,7 +19,7 @@
                 [%- FOREACH page IN myopac_pages;
                     IF page.url == myopac_page;
                         cls_which = "acct-tab-on";
-                        ctx.page_title = l("Your Account - [_1]", page.name);
+                        ctx.page_title = l("My Account - [_1]", page.name);
                     ELSE;
                         cls_which = "acct-tab-off";
                     END -%]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index c3886b1..8df74bb 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -62,7 +62,7 @@
     [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
     <div class="opac-auto-102">
         [ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
-            l('Click to Refine Your Original Search')
+            l('Refine My Original Search')
         %]</a> ]
     </div>
     [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2
index f9a8d61..7ac7728 100644
--- a/Open-ILS/src/templates/opac/parts/topnav.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav.tt2
@@ -9,7 +9,7 @@
         <div id="your-acct-login">
             <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
                 class="opac-button opac-button-header" id="home_myopac_link">
-                [% l('Your Account Log in') %]
+                [% l('My Account') %]
             </a>
         </div>
         [% ELSE %]

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

Summary of changes:
 Open-ILS/src/templates/opac/myopac/lists.tt2      |    4 ++--
 Open-ILS/src/templates/opac/parts/myopac/base.tt2 |    2 +-
 Open-ILS/src/templates/opac/parts/searchbar.tt2   |    2 +-
 Open-ILS/src/templates/opac/parts/topnav.tt2      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS