From 7217a99c59c48f379aaa308194efd42d3fc9b91a Mon Sep 17 00:00:00 2001
From: shubham_meena <none@none>
Date: Sun, 23 Mar 2014 17:56:42 +0530
Subject: [PATCH 1/2] added title of web in translations

--HG--
branch : Issue#121
---
 code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini  | 3 ++-
 code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini  | 3 ++-
 .../ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
index 586d49241..f70fdfe3b 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
@@ -6,6 +6,7 @@ login_info = "Please enter your MySQL Username and Password to install the datab
 login_here = "here"
 
 [dashboard]
+ams_title="Ryzom Account Mangement System"
 home_title = "Introduction"
 home_info = "Welcome to the Ryzom Core - Account Management System"
 
@@ -242,4 +243,4 @@ email_body_forgot_password_header = "A request to reset your account's password
 email_body_forgot_password_footer = "
 ----------
 If you didn't make this request, please ignore this message."
-;===========================================================================
\ No newline at end of file
+;===========================================================================
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
index b4fa1fcf6..c48ca031b 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
@@ -2,6 +2,7 @@
 ; Comments start with ';', as in php.ini
 
 [dashboard]
+ams_title="Ryzom Account Mangement System"
 home_title = "Presentation"
 home_info = "Bienvenue sur le Ryzom Core - Account Management System"
 
@@ -230,4 +231,4 @@ email_body_forgot_password_header = "Une demande de reinitialiser le mot de pass
 email_body_forgot_password_footer = "
 ----------
 Si vous n'avez pas fait cette demande, s'il vous plait ignorer ce message."
-;===========================================================================
\ No newline at end of file
+;===========================================================================
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
index fa97211d7..5e5e0fb9f 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
@@ -12,7 +12,7 @@
 		http://twitter.com/halalit_usman
 	-->
 	<meta charset="utf-8">
-	<title>Ryzom Account Management System</title>
+	<title>{$ams_title}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta name="description" content="ryzom,ams">
 	<meta name="author" content="Daan Janssens & Matthew Lagoe">

From 5bef18032ebea8a5b4c2c6b7033276c1ea46e24f Mon Sep 17 00:00:00 2001
From: shubham_meena <none@none>
Date: Sun, 23 Mar 2014 18:48:39 +0530
Subject: [PATCH 2/2] added web title in translations

--HG--
branch : Issue#121
---
 .../tools/server/ryzom_ams/ams_lib/autoload/helpers.php      | 5 +++++
 .../ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini | 4 +++-
 .../ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
index 40a96f6c1..8f99bfc93 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
@@ -62,6 +62,11 @@ class Helpers{
              $smarty -> assign( $key, $value );
              }
 
+		 //load ams content variables that are language dependent
+		 foreach ( $variables['ams_content'] as $key => $value){
+			 $smarty -> assign( $key, $value);
+			 }
+
           //smarty inheritance for loading the matching wrapper layout (with the matching menu bar)
           if( isset($vars['permission']) && $vars['permission'] == 3 ){
                $inherited = "extends:layout_admin.tpl|";
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
index f70fdfe3b..322c43779 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
@@ -5,8 +5,10 @@
 login_info = "Please enter your MySQL Username and Password to install the database.<br>This is being loaded because the is_installed file is missing.<br>This process will take about 30 seconds."
 login_here = "here"
 
-[dashboard]
+[ams_content]
 ams_title="Ryzom Account Mangement System"
+
+[dashboard]
 home_title = "Introduction"
 home_info = "Welcome to the Ryzom Core - Account Management System"
 
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
index c48ca031b..57d6e7e66 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
@@ -1,8 +1,10 @@
 ; This is a sample configuration file
 ; Comments start with ';', as in php.ini
 
-[dashboard]
+[ams_content]
 ams_title="Ryzom Account Mangement System"
+
+[dashboard]
 home_title = "Presentation"
 home_info = "Bienvenue sur le Ryzom Core - Account Management System"