From 3b3323ef12c6eb513f5da8410248f5b0833b4179 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Wed, 22 Apr 2015 12:43:14 -0500
Subject: [PATCH] Alter language vars to match conventions - refs #4467

---
 .../app/controller/shibboleth_controller.class.php | 14 +++++++-------
 .../app/view/shibboleth_display.class.php          |  8 ++++----
 .../app/view/shibboleth_email_form.class.php       |  6 +++---
 .../view/shibboleth_status_request_form.class.php  | 10 +++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/main/auth/shibboleth/app/controller/shibboleth_controller.class.php b/main/auth/shibboleth/app/controller/shibboleth_controller.class.php
index a1a6c1f6f6..4ba31dc6e8 100755
--- a/main/auth/shibboleth/app/controller/shibboleth_controller.class.php
+++ b/main/auth/shibboleth/app/controller/shibboleth_controller.class.php
@@ -44,7 +44,7 @@ class ShibbolethController
 
         if ($user->is_empty())
         {
-            $message = get_lang('no_login');
+            $message = get_lang('SystemCouldNotLogYouIn');
             Shibboleth::display()->error_page($message);
         }
 
@@ -86,7 +86,7 @@ class ShibbolethController
      */
     public function admin_login()
     {
-        $title = get_lang('internal_login');
+        $title = get_lang('InternalLogin');
         if (Shibboleth::session()->is_logged_in())
         {
             $message = get_lang('already_logged_in');
@@ -125,7 +125,7 @@ class ShibbolethController
 
         if ($reason = $form->get_reason())
         {
-            $subject = get_lang('request_status');
+            $subject = get_lang('RequestStatus');
             $status = $form->get_status();
             $status = Shibboleth::format_status($status);
 
@@ -139,20 +139,20 @@ EOT;
             $success = Shibboleth::email_admin($subject, $message);
             if ($success)
             {
-                $request_submitted = get_lang('request_submitted');
+                $request_submitted = get_lang('RequestSubmitted');
                 Shibboleth::display()->message_page($request_submitted);
             }
             else
             {
-                $request_failed = get_lang('request_failed');
+                $request_failed = get_lang('RequestFailed');
                 Shibboleth::display()->error_page($request_failed);
             }
         }
 
-        $title = get_lang('request_status');
+        $title = get_lang('RequestStatus');
         Display :: display_header($title);
         echo $form->display();
         Display :: display_footer();
     }
 
-}
\ No newline at end of file
+}
diff --git a/main/auth/shibboleth/app/view/shibboleth_display.class.php b/main/auth/shibboleth/app/view/shibboleth_display.class.php
index 4790ac963e..be15f0c774 100755
--- a/main/auth/shibboleth/app/view/shibboleth_display.class.php
+++ b/main/auth/shibboleth/app/view/shibboleth_display.class.php
@@ -29,7 +29,7 @@ class ShibbolethDisplay
 
     public function error_page($message)
     {
-        $page_title = get_lang('page_title');
+        $page_title = get_lang('ShibbolethLogin');
 
         Display :: display_header($page_title);
         Display :: display_error_message($message);
@@ -39,7 +39,7 @@ class ShibbolethDisplay
     
     public function message_page($message, $title = '')
     {
-        $title = $title ? $title : get_lang('page_title');
+        $title = $title ? $title : get_lang('ShibbolethLogin');
 
         Display :: display_header($title);
         Display :: display_confirmation_message($message);
@@ -49,7 +49,7 @@ class ShibbolethDisplay
     
     public function page($content, $title = '')
     {
-        $title = $title ? $title : get_lang('page_title');
+        $title = $title ? $title : get_lang('ShibbolethLogin');
 
         Display :: display_header($title);
         echo $content;
@@ -57,4 +57,4 @@ class ShibbolethDisplay
         die;
     }
 
-}
\ No newline at end of file
+}
diff --git a/main/auth/shibboleth/app/view/shibboleth_email_form.class.php b/main/auth/shibboleth/app/view/shibboleth_email_form.class.php
index db48d9435f..3e323f2bb1 100755
--- a/main/auth/shibboleth/app/view/shibboleth_email_form.class.php
+++ b/main/auth/shibboleth/app/view/shibboleth_email_form.class.php
@@ -31,8 +31,8 @@ class ShibbolethEmailForm
     function display()
     {
         
-        $email = get_lang('email');
-        $submit = get_lang('submit');
+        $email = get_lang('Email');
+        $submit = get_lang('Submit');
         return <<<EOT
         <form id="email_form" action="" method="post">
             <label for="">$email</label>
@@ -48,4 +48,4 @@ EOT;
         return isset($_POST['email']) ? $_POST['email'] : '';
     }
 
-}
\ No newline at end of file
+}
diff --git a/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php b/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php
index eebe5588da..e1a8e29418 100755
--- a/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php
+++ b/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php
@@ -32,13 +32,13 @@ class ShibbolethStatusRequestForm
     {
         if ($this->is_submitted() && $this->get_reason() == '')
         {
-            $reason_is_mandatory = get_lang('reason_is_mandatory');
+            $reason_is_mandatory = get_lang('ReasonIsMandatory');
             Display::display_error_message($reason_is_mandatory);
         }
 
-        $status_request_message = get_lang('status_request_message');
-        $label_new_status = get_lang('new_status');
-        $label_reason = get_lang('reason');
+        $status_request_message = get_lang('StatusRequestMessage');
+        $label_new_status = get_lang('NewStatus');
+        $label_reason = get_lang('Reason');
         $label_ok = get_lang('Ok');
         $label_cancel = get_lang('Cancel');
 
@@ -94,4 +94,4 @@ EOT;
         return isset($_POST['status']) ? $_POST['status'] : '';
     }
 
-}
\ No newline at end of file
+}