[Rt-commit] rt branch, 4.2/prefer-preferences, created. rt-4.1.17-198-g244ba9b

[Kevin Falcone]

The branch, 4.2/prefer-preferences has been created
        at  244ba9b2238614c1098740666c216574170696ba (commit)

- Log -----------------------------------------------------------------
commit 244ba9b2238614c1098740666c216574170696ba
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Aug 6 15:30:00 2013 -0400

    Standardize on Preferences.
    
    We often say "Go change your preference", but the menu is called
    Options, and the page it loads is titled Settings.  The URI also
    contains Prefs.

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index bfc38e3..7522d81 100644
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -550,7 +550,7 @@ my $build_main_nav = sub {
     if ( $session{'CurrentUser'}->UserObj
          && $session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => RT->System )) {
         my $settings = $about_me->child( settings => title => loc('Settings'), path => '/Prefs/Other.html' );
-        $settings->child( options        => title => loc('Options'),        path => '/Prefs/Other.html' );
+        $settings->child( options        => title => loc('Preferences'),        path => '/Prefs/Other.html' );
         $settings->child( about_me       => title => loc('About me'),       path => '/User/Prefs.html' );
         $settings->child( search_options => title => loc('Search options'), path => '/Prefs/SearchOptions.html' );
         $settings->child( myrt           => title => loc('RT at a glance'), path => '/Prefs/MyRT.html' );
diff --git a/share/html/Prefs/Other.html b/share/html/Prefs/Other.html
index 9a04cc2..224e2d8 100644
--- a/share/html/Prefs/Other.html
+++ b/share/html/Prefs/Other.html
@@ -77,7 +77,7 @@
 </form>
 <%INIT>
 my @results;
-my $title = loc("Settings");
+my $title = loc("Preferences");
 
 my $UserObj = $session{'CurrentUser'}->UserObj;
 my $preferences = $UserObj->Preferences( $RT::System );

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