From 7a08ca1430d29db1c6b542c06fc1bd368cb18078 Mon Sep 17 00:00:00 2001
From: Dan Wells <dbw2@calvin.edu>
Date: Fri, 1 Feb 2013 14:39:23 -0500
Subject: [PATCH] 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@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>

Conflicts:
	Open-ILS/src/templates/opac/myopac/lists.tt2
---
 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(-)

diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 52e06895a9..5347d34885 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 a0be906792..30ac614094 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 c3886b1252..8df74bb147 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 f9a8d618a4..7ac772888f 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 %]
-- 
2.11.0