From dae07e1061c212f3aa71af1a9d088ed70b20ba4e Mon Sep 17 00:00:00 2001
From: Franck Allimant <franck@cqfdev.fr>
Date: Thu, 7 Nov 2013 00:12:06 +0100
Subject: [PATCH] Fixed issue #86

---
 templates/admin/default/admin-layout.tpl                 | 2 +-
 templates/admin/default/includes/inner-form-toolbar.html | 6 +++---
 templates/admin/default/translations.html                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 887f2b9db..03a011866 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -202,7 +202,7 @@
 
 	{elseloop rel="top-bar-auth"}
 	    <div class="brandbar brandbar-wide container">
-	        <a class="navbar-brand" href="{url path='/admin'}">{images file='assets/img/logo-thelia-34px.png'}<img src="{$asset_url}" alt="{intl l='Thelia, solution e-commerce libre'}" />{/images}</a>
+	        <a class="navbar-brand" href="{url path='/admin'}">{images file='assets/img/logo-thelia-34px.png'}<img src="{$asset_url}" alt="{intl l='Thelia, the open source e-commerce solution'}" />{/images}</a>
 	    </div>
 	{/elseloop}
 
diff --git a/templates/admin/default/includes/inner-form-toolbar.html b/templates/admin/default/includes/inner-form-toolbar.html
index bedfd9320..f2a5a5fc4 100755
--- a/templates/admin/default/includes/inner-form-toolbar.html
+++ b/templates/admin/default/includes/inner-form-toolbar.html
@@ -6,7 +6,7 @@ Parameters:
    - hide_flags: true / false. If true, the flags will not be visible
    - hide_submit_buttons: true / false. If true, only the close button will be deplayed.
    - show_currencies: true/false. If true, show the currency selection bar
-   - page_url: the current page URL. Dafault id $current_url. Used to switchedition anguage.
+   - page_url: the current page URL. Default is $current_url. Used to switchedition anguage.
    - close_url: no default. URL displayed when close button is clicked. If empty, the close button is not displayed.
 *}
 
@@ -16,8 +16,8 @@ Parameters:
 		<ul class="nav nav-pills">
 		    {loop name="lang_list" type="lang"}
 		    <li {if $ID == $edit_language_id}class="active"{/if}>
-		        <a class="language-change-button" data-language-id="{$ID}" href="{url path={$page_url|default:$current_url} edit_language_id=$ID}" title="{intl l='Edit information in %lng' lng=$TITLE}">
-		            <img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" />
+		        <a class="language-change-button" data-language-id="{$ID}" href="{url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}" title="{intl l='Edit information in %lng' lng=$TITLE}">
+		            <img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="$TITLE" />
 		        </a>
 		    </li>
 		    {/loop}
diff --git a/templates/admin/default/translations.html b/templates/admin/default/translations.html
index a5d6d9b8f..fa41a3cf6 100644
--- a/templates/admin/default/translations.html
+++ b/templates/admin/default/translations.html
@@ -164,7 +164,7 @@
 											<div class="panel panel-default">
 											    <div class="panel-heading">
                                                     {loop name="lang_list" type="lang" id=$edit_language_id}
-                                                        <img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" />
+                                                        <img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{$TITLE}" />
                                                     {/loop}
 
                                                     {$label} {$file_names nofilter}