From a9612145c82f67ad48d4a018d58ec78174dd9833 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 21 Sep 2010 09:12:12 -0700
Subject: [PATCH] Added changelot entry, called the i18n sub, changed to
 compound keys, updated the default WebGUI.conf file, added upgrade output.

---
 docs/changelog/7.x.x.txt               |  1 +
 docs/upgrades/upgrade_7.10.0-7.10.1.pl | 23 +++++++++++++----------
 etc/WebGUI.conf.original               |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1b75aae02..fdefbf16d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -15,6 +15,7 @@
  - fixed: typo in the Gallery Add Archive default templateId.
  - fixed #11876: packing templates, snippets, headtags removes conditional CSS comments
  - fixed #11877: Criteria Builder on "shortcut by alternate criteria" gets ugly with many checkbox items
+ - fixed #11878: Addons title not internationalized
 
 7.10.0
  - fixed #11812: Checking www_ajaxSave's response in the cart js, urlencoding post parameters
diff --git a/docs/upgrades/upgrade_7.10.0-7.10.1.pl b/docs/upgrades/upgrade_7.10.0-7.10.1.pl
index ca6b7ec5b..621af5c02 100644
--- a/docs/upgrades/upgrade_7.10.0-7.10.1.pl
+++ b/docs/upgrades/upgrade_7.10.0-7.10.1.pl
@@ -33,6 +33,7 @@ my $session = start(); # this line required
 # upgrade functions go here
 uniqueProductLocations($session);
 removeBadSpanishFile($session);
+i18nForAddonsTitle($session);
 
 finish($session); # this line required
 
@@ -68,16 +69,18 @@ sub uniqueProductLocations {
 #----------------------------------------------------------------------------
 # This internationalizes the link text of the addons link in the adminconsole
 sub i18nForAddonsTitle {
-	my $session = shift;
-	my $adminConsole = $session->config->get('adminConsole');
-	$adminConsole->{'addons'} = {
-	      icon    => "addons.png",
-	      uiLevel => 1,
-	      group   => "12",
-		url     => "http://www.webgui.org/addons",
-	      title   => "^International(Addons title,WebGUI);"	
-	};
-	$session->config->set('adminConsole',$adminConsole);
+    my $session = shift;
+    print "\tInternationalize the text of the addons link in the adminconsole... " unless $quiet;
+    $session->config->set('adminConsole/addons',
+        {
+            icon    => "addons.png",
+            uiLevel => 1,
+            group   => "12",
+            url     => "http://www.webgui.org/addons",
+            title   => "^International(Addons title,WebGUI);"	
+        }
+    );
+    print "DONE!\n" unless $quiet;
 }
 #----------------------------------------------------------------------------
 # Describe what our function does
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index b9135cf12..501042387 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -406,7 +406,7 @@
       "uiLevel" : 1,
       "group" : "12",
       "url" : "http://www.webgui.org/addons",
-      "title" : "Addons"
+      "title" : "^International(Addons title,WebGUI);"
    },
    "contentFilters" : {
       "icon" : "contentFilters.gif",