In-Portal Issue Tracker

Welcome to the In-Portal Open Source CMS Issue Tracker! This is a central management / tracking tool for all types of tasks / issues / bugs for the In-Portal Project. Before reporting any issues, please make sure to read the Guide into Issue Tracker and How to Properly Test and Report Bugs!

Viewing Issue Simple Details [ Jump to Notes ] [ Wiki ] [ Related Changesets ]

[ View Advanced ] [ Issue History ] [ Print ]

Tags

No tags attached.

Reference

Change Log Message

Estimate Points

Attached Files

home_category_phrase_separated_core.patch [^] (13,725 bytes) 2010-06-15 13:10 [Show Content]

Index: install/english.lang
===================================================================
--- install/english.lang	(revision 13756)
+++ install/english.lang	(working copy)
@@ -931,7 +931,6 @@
 			<PHRASE Label="la_Prompt_Restore_Status" Module="Core" Type="1">UmVzdG9yZSBTdGF0dXM=</PHRASE>
 			<PHRASE Label="la_Prompt_Restore_Success" Module="Core" Type="1">UmVzdG9yZSBoYXMgYmVlbiBjb21wbGV0ZWQgc3VjY2Vzc2Z1bGx5</PHRASE>
 			<PHRASE Label="la_prompt_RootCategory" Module="Core" Type="1">U2VsZWN0IE1vZHVsZSBSb290IFNlY3Rpb246</PHRASE>
-			<PHRASE Label="la_prompt_root_name" Module="Core" Type="1">Um9vdCBzZWN0aW9uIG5hbWUgKGxhbmd1YWdlIHZhcmlhYmxlKQ==</PHRASE>
 			<PHRASE Label="la_prompt_root_pass" Module="Core" Type="1">Um9vdCBQYXNzd29yZA==</PHRASE>
 			<PHRASE Label="la_prompt_SearchType" Module="Core" Type="1">U2VhcmNoIFR5cGU=</PHRASE>
 			<PHRASE Label="la_prompt_Select_Source" Module="Core" Type="1">U2VsZWN0IFNvdXJjZSBMYW5ndWFnZQ==</PHRASE>
@@ -976,6 +975,7 @@
 			<PHRASE Label="la_RequiredWarning" Module="Core" Type="1">Tm90IGFsbCByZXF1aXJlZCBmaWVsZHMgYXJlIGZpbGxlZC4gUGxlYXNlIGZpbGwgdGhlbSBmaXJzdC4=</PHRASE>
 			<PHRASE Label="la_review_perpage_prompt" Module="Core" Type="1">Q29tbWVudHMgcGVyIFBhZ2U=</PHRASE>
 			<PHRASE Label="la_review_perpage_short_prompt" Module="Core" Type="1">Q29tbWVudHMgcGVyIFBhZ2UgKHNob3J0LWxpc3Qp</PHRASE>
+			<PHRASE Label="la_rootcategory_name" Module="Core" Type="1">SG9tZQ==</PHRASE>
 			<PHRASE Label="la_SampleText" Module="Core" Type="1">U2FtcGxlIFRleHQ=</PHRASE>
 			<PHRASE Label="la_SaveLogin" Module="Core" Type="1">U2F2ZSBVc2VybmFtZSBvbiBUaGlzIENvbXB1dGVy</PHRASE>
 			<PHRASE Label="la_Search" Module="Core" Type="1">U2VhcmNo</PHRASE>
Index: install/install_data.sql
===================================================================
--- install/install_data.sql	(revision 13756)
+++ install/install_data.sql	(working copy)
@@ -7,15 +7,14 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Category_Short', '3', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_category_perpage__short_prompt', 'text', '', '', 10.04, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_DaysNew', '8', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_category_daysnew_prompt', 'text', '', '', 10.05, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_ShowPick', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_category_showpick_prompt', 'checkbox', '', '', 10.06, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Root_Name', 'lu_rootcategory_name', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_prompt_root_name', 'text', '', '', 10.07, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_prompt_max_import_category_levels', 'text', '', '', 10.08, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AllowDeleteRootCats', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_AllowDeleteRootCats', 'checkbox', NULL, NULL, 10.09, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Catalog_PreselectModuleTab', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.1, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RecycleBinFolder', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_RecycleBinFolder', 'text', NULL, NULL, 10.11, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL, NULL, 10.12, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'FilenameSpecialCharReplacement', '-', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_||-=+-', 10.13, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'YahooApplicationId', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.14, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_MinKeyword_Length', '3', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_Search_MinKeyword_Length', 'text', NULL, NULL, 10.15, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_prompt_max_import_category_levels', 'text', '', '', 10.07, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AllowDeleteRootCats', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_AllowDeleteRootCats', 'checkbox', NULL, NULL, 10.08, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Catalog_PreselectModuleTab', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RecycleBinFolder', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_RecycleBinFolder', 'text', NULL, NULL, 10.10, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL, NULL, 10.11, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'FilenameSpecialCharReplacement', '-', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_||-=+-', 10.12, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'YahooApplicationId', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.13, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_MinKeyword_Length', '3', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_Search_MinKeyword_Length', 'text', NULL, NULL, 10.14, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_MetaKey', '', 'In-Portal', 'in-portal:configure_categories', 'la_Text_MetaInfo', 'la_category_metakey', 'textarea', '', '', 20.01, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_MetaDesc', '', 'In-Portal', 'in-portal:configure_categories', 'la_Text_MetaInfo', 'la_category_metadesc', 'textarea', '', '', 20.02, 0, 1, NULL);
 
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql	(revision 13758)
+++ install/upgrades.sql	(working copy)
@@ -1901,4 +1901,10 @@
 
 # ===== v 5.1.0-B2 =====
 
-# ===== v 5.1.0-RC1 =====
\ No newline at end of file
+# ===== v 5.1.0-RC1 =====
+DELETE FROM ConfigurationValues WHERE VariableName = 'Root_Name';
+DELETE FROM Phrase WHERE PhraseKey = 'LA_PROMPT_ROOT_NAME';
+
+UPDATE ConfigurationValues
+SET DisplayOrder = DisplayOrder - 0.01
+WHERE ModuleOwner = 'In-Portal' AND `Section` = 'in-portal:configure_categories' AND DisplayOrder > 10.07;
\ No newline at end of file
Index: kernel/db/cat_tag_processor.php
===================================================================
--- kernel/db/cat_tag_processor.php	(revision 13756)
+++ kernel/db/cat_tag_processor.php	(working copy)
@@ -244,13 +244,7 @@
 			$object =& $this->getObject($params);
 			$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
-			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-			if ($category_id == 0) {
-				// home category name is phrase AND phrase name is defined in configuration
-				$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-			}
-
+			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ($category_path === false) {
@@ -260,7 +254,7 @@
 					$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
-					$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);
Index: kernel/processors/main_processor.php
===================================================================
--- kernel/processors/main_processor.php	(revision 13756)
+++ kernel/processors/main_processor.php	(working copy)
@@ -945,12 +945,18 @@
 		}
 	}
 
+	/**
+	 * Returns Home category name
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @deprecated
+	 */
 	function RootCategoryName($params)
 	{
-		$phrase_name = $this->Application->ConfigValue('Root_Name');
 		$no_editing = array_key_exists('no_editing', $params) && $params['no_editing'];
 
-		return $this->Application->Phrase($phrase_name, !$no_editing);
+		return $this->Application->Phrase('la_rootcategory_name', !$no_editing);
 	}
 
 	/**
Index: units/categories/categories_item.php
===================================================================
--- units/categories/categories_item.php	(revision 13756)
+++ units/categories/categories_item.php	(working copy)
@@ -213,7 +213,7 @@
 		{
 			if ($this->IsRoot() && $this->Prefix == 'c') {
 				$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
-				$category_name = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+				$category_name = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				$this->SetDBField($title_field, $category_name);
 				return false;
 			}
Index: units/categories/categories_tag_processor.php
===================================================================
--- units/categories/categories_tag_processor.php	(revision 13756)
+++ units/categories/categories_tag_processor.php	(working copy)
@@ -114,7 +114,7 @@
 
 		return $icon_prefix . 'section.png';
 	}
-	
+
 	function ItemCount($params)
 	{
 		$object =& $this->getObject($params);
@@ -1024,13 +1024,7 @@
 		$object =& $this->getObject($params);
 		$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
-		$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-		if ($category_id == 0) {
-			// home category name is phrase AND phrase name is defined in configuration
-			$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-		}
-
+		$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 		$category_path = $this->Application->getCache($cache_key);
 
 		if ($category_path === false) {
@@ -1062,7 +1056,7 @@
 				$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 			}
 			else {
-				$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+				$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			}
 
 			$this->Application->setCache($cache_key, $category_path);
Index: units/category_items/category_items_tag_processor.php
===================================================================
--- units/category_items/category_items_tag_processor.php	(revision 13756)
+++ units/category_items/category_items_tag_processor.php	(working copy)
@@ -23,7 +23,7 @@
 			$object =& $this->getObject($params);
 			/* @var $object kDBList */
 
-			$root_phrase = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+			$root_phrase = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $object->GetDBField($field));
 			$value = str_replace('&|&', ' > ', $cached_navbar);
 
Index: units/permissions/permissions_tag_processor.php
===================================================================
--- units/permissions/permissions_tag_processor.php	(revision 13756)
+++ units/permissions/permissions_tag_processor.php	(working copy)
@@ -182,13 +182,7 @@
 		function CategoryPath($params)
 		{
 			$category_id = $params['cat_id'];
-			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-			if ("$category_id" == '0') {
-				// home category name is phrase AND phrase name is defined in configuration
-				$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-			}
-
+			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ($category_path === false) {
@@ -205,7 +199,7 @@
 					$category_path = trim($this->CategoryPath( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
-					$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);

home_category_phrase_separated_themes.patch [^] (5,713 bytes) 2010-06-15 13:10 [Show Content]

Index: advanced/platform/elements/forms.elm.tpl
===================================================================
--- advanced/platform/elements/forms.elm.tpl	(revision 13756)
+++ advanced/platform/elements/forms.elm.tpl	(working copy)
@@ -496,7 +496,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="primary_root_category">
-	<inp2:m_RootCategoryName/>
+	<inp2:m_Phrase name="lu_rootcategory_name"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_pr_category_label" no_editing="1" is_last="0" editing="0">
Index: advanced/platform/elements/menu.elm.tpl
===================================================================
--- advanced/platform/elements/menu.elm.tpl	(revision 13756)
+++ advanced/platform/elements/menu.elm.tpl	(working copy)
@@ -20,7 +20,7 @@
 										<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
 										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
 										    <items>
-										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
+										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_Phrase name="lu_rootcategory_name"/>]]></item>
 										    	<inp2:m_Include template="platform/elements/menu_sections.xml" />
 										    </items>
 										  </menubar>
@@ -58,7 +58,7 @@
 							<table>
 								<tr>
 									<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
-									<inp2:m_RootCategoryName result_to_var="title"/>
+									<inp2:m_Phrase name="lu_rootcategory_name" result_to_var="title"/>
 									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
 									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif"/>
 									<inp2:st_CachedMenu level="0" category_id="0" render_as="static_top_menu_element"/>
Index: advanced/platform/elements/navigation_bar.elm.tpl
===================================================================
--- advanced/platform/elements/navigation_bar.elm.tpl	(revision 13756)
+++ advanced/platform/elements/navigation_bar.elm.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:m_DefaultParam titles="" templates="" show_category="0"/>
 
 <inp2:m_DefineElement name="root_category">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="module_root">
Index: onlinestore/in-commerce/blocks/categories/current_path.tpl
===================================================================
--- onlinestore/in-commerce/blocks/categories/current_path.tpl	(revision 13756)
+++ onlinestore/in-commerce/blocks/categories/current_path.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:m_DefaultParam titles="" templates="" show_category="0"/>
 
 <inp2:m_DefineElement name="root_category">
-	<a class="link-nav-bar" href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
+	<a class="link-nav-bar" href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="module_root">
Index: onlinestore/in-commerce/blocks/categories/title_path.tpl
===================================================================
--- onlinestore/in-commerce/blocks/categories/title_path.tpl	(revision 13756)
+++ onlinestore/in-commerce/blocks/categories/title_path.tpl	(working copy)
@@ -1,5 +1,5 @@
 <inp2:m_DefineElement name="root_category">
-	<inp2:c_RootCategoryName/>
+	<inp2:m_Phrase name="lu_rootcategory_name"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="title_category">
Index: simple/elements/navigation_bar.elm.tpl
===================================================================
--- simple/elements/navigation_bar.elm.tpl	(revision 13756)
+++ simple/elements/navigation_bar.elm.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:m_DefaultParam titles="" templates="" show_category="0"/>
 
 <inp2:m_DefineElement name="root_category">
-	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
+	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="module_root">
Index: simple/elements/navigation_menu.elm.tpl
===================================================================
--- simple/elements/navigation_menu.elm.tpl	(revision 13756)
+++ simple/elements/navigation_menu.elm.tpl	(working copy)
@@ -18,7 +18,7 @@
 
 <ul id="nav">
 	<li>
-		<a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>" title="<inp2:m_RootCategoryName no_editing='1'/>"><inp2:m_RootCategoryName no_editing='1'/></a>
+		<a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>" title="<inp2:m_Phrase name='lu_rootcategory_name' no_editing='1'/>"><inp2:m_RootCategoryName no_editing='1'/></a>
 	</li>
 	<inp2:st_CachedMenu render_as="menu_element" category_id="1"/>
 </ul>
\ No newline at end of file

home_category_phrase_separated_modules.patch [^] (2,819 bytes) 2010-06-15 13:18 [Show Content]

Index: in-commerce/admin_templates/import.tpl
===================================================================
--- in-commerce/admin_templates/import.tpl	(revision 13756)
+++ in-commerce/admin_templates/import.tpl	(working copy)
@@ -171,7 +171,7 @@
 
 	<!-- CATEGORY SELECTOR: BEGIN -->
 		<inp2:m_DefineElement name="root_cat_caption">
-			<inp2:c_RootCategoryName/>
+			<inp2:m_Phrase name="la_rootcategory_name"/>
 		</inp2:m_DefineElement>
 
 		<inp2:m_DefineElement name="category_caption">
Index: in-link/admin_templates/import.tpl
===================================================================
--- in-link/admin_templates/import.tpl	(revision 13756)
+++ in-link/admin_templates/import.tpl	(working copy)
@@ -169,7 +169,7 @@
 
 	<!-- CATEGORY SELECTOR: BEGIN -->
 		<inp2:m_DefineElement name="root_cat_caption">
-			<inp2:c_RootCategoryName/>
+			<inp2:m_Phrase name="la_rootcategory_name"/>
 		</inp2:m_DefineElement>
 
 		<inp2:m_DefineElement name="category_caption">
Index: in-link/units/link_validation/link_validation_tp.php
===================================================================
--- in-link/units/link_validation/link_validation_tp.php	(revision 13756)
+++ in-link/units/link_validation/link_validation_tp.php	(working copy)
@@ -40,13 +40,7 @@
 			$object =& $this->getObject($params);
 			$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
-			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-			if ($category_id == 0) {
-				// home category name is phrase AND phrase name is defined in configuration
-				$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-			}
-
+			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%]';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ($category_path === false) {
@@ -55,7 +49,7 @@
 					$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
-					$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);
Index: in-news/admin_templates/import.tpl
===================================================================
--- in-news/admin_templates/import.tpl	(revision 13756)
+++ in-news/admin_templates/import.tpl	(working copy)
@@ -171,7 +171,7 @@
 
 	<!-- CATEGORY SELECTOR: BEGIN -->
 		<inp2:m_DefineElement name="root_cat_caption">
-			<inp2:c_RootCategoryName/>
+			<inp2:m_Phrase name="la_rootcategory_name"/>
 		</inp2:m_DefineElement>
 
 		<inp2:m_DefineElement name="category_caption">

home_category_phrase_separated_core_addon1.patch [^] (817 bytes) 2010-06-15 14:56 [Show Content]

Index: units/helpers/category_helper.php
===================================================================
--- units/helpers/category_helper.php	(revision 13756)
+++ units/helpers/category_helper.php	(working copy)
@@ -248,7 +248,7 @@
 			$block_params['current'] = $current_category == $block_params['cat_id'] ? 1 : 0;
 			$block_params['separator'] = $params['separator'];
 			$block_params['is_first'] = $params['is_first'];
-			$block_params['cat_name'] = $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params);
+			$block_params['cat_name'] = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			$block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,render_as');
 
 			return $this->Application->ParseBlock($block_params);

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0002461) alex (manager) 2010-06-15 13:12	Because lack of time I didn't used "lu_Home", but leaved original used phrase "lu_rootcategory_name".

(0002462) alex (manager) 2010-06-15 13:18	Reminder sent to: Dmitry Patch for modules added. Please restart testing if you already started it.

(0002470) Dmitry (manager) 2010-06-15 15:53	Patch tested. Please commit.

(0002471) alex (manager) 2010-06-15 16:00	Fix committed to 5.1.x branch. Commit Message: Fixes 0000776: Change usage of "lu_rootcategory_name" Language label

(0002582) alex (manager) 2010-07-22 15:07	Closing, since 5.1.0 release has been released.

Related Changesets
In-Portal CMS: 5.1.x r13789 Timestamp: 2010-06-15 16:00:24 Author: alex [ Details ] [ Diff ]	Fixes 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /in-portal/branches/5.1.x/core/install/english.lang	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/install/install_data.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/kernel/db/cat_tag_processor.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/kernel/processors/main_processor.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/categories/categories_item.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/categories/categories_tag_processor.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/category_items/category_items_tag_processor.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/helpers/category_helper.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/permissions/permissions_tag_processor.php	[ Diff ] [ File ]

Modules :: In-News: 5.1.x r13788 Timestamp: 2010-06-15 15:58:59 Author: alex [ Details ] [ Diff ]	Bug 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /modules/in-news/branches/5.1.x/admin_templates/import.tpl	[ Diff ] [ File ]

Modules :: In-Link: 5.1.x r13787 Timestamp: 2010-06-15 15:58:37 Author: alex [ Details ] [ Diff ]	Bug 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /modules/in-link/branches/5.1.x/admin_templates/import.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/units/link_validation/link_validation_tp.php	[ Diff ] [ File ]

Modules :: In-Commerce: 5.1.x r13786 Timestamp: 2010-06-15 15:57:23 Author: alex [ Details ] [ Diff ]	Bug 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /w/in-commerce/branches/5.1.x/admin_templates/import.tpl	[ Diff ] [ File ]

Themes :: Simple: 1.1.x r13785 Timestamp: 2010-06-15 15:56:37 Author: alex [ Details ] [ Diff ]	Bug 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /themes/simple/branches/1.1.x/elements/navigation_bar.elm.tpl	[ Diff ] [ File ]
	mod - /themes/simple/branches/1.1.x/elements/navigation_menu.elm.tpl	[ Diff ] [ File ]

Themes :: OnlineStore: 1.1.x r13784 Timestamp: 2010-06-15 15:56:21 Author: alex [ Details ] [ Diff ]	Bug 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /themes/onlinestore/branches/1.1.x/in-commerce/blocks/categories/current_path.tpl	[ Diff ] [ File ]
	mod - /themes/onlinestore/branches/1.1.x/in-commerce/blocks/categories/title_path.tpl	[ Diff ] [ File ]

Themes :: Advanced: 1.1.x r13783 Timestamp: 2010-06-15 15:55:36 Author: alex [ Details ] [ Diff ]	Bug 0000776: Change usage of "lu_rootcategory_name" Language label
	mod - /themes/advanced/branches/1.1.x/platform/elements/forms.elm.tpl	[ Diff ] [ File ]
	mod - /themes/advanced/branches/1.1.x/platform/elements/menu.elm.tpl	[ Diff ] [ File ]
	mod - /themes/advanced/branches/1.1.x/platform/elements/navigation_bar.elm.tpl	[ Diff ] [ File ]

Issue History
Date Modified	Username	Field	Change
2010-07-22 15:07	alex	Note Added: 0002582
2010-07-22 15:07	alex	Status	resolved => closed
2010-06-15 16:00	alex	Note Added: 0002471
2010-06-15 16:00	alex	Status	reviewed and tested => resolved
2010-06-15 16:00	alex	Fixed in Version	=> 5.1.0-RC1
2010-06-15 16:00	alex	Resolution	open => fixed
2010-06-15 16:00	alex	Changeset attached	5.1.x r13789
2010-06-15 15:58	alex	Changeset attached	5.1.x r13788
2010-06-15 15:58	alex	Changeset attached	5.1.x r13787
2010-06-15 15:57	alex	Changeset attached	5.1.x r13786
2010-06-15 15:56	alex	Changeset attached	1.1.x r13785
2010-06-15 15:56	alex	Changeset attached	1.1.x r13784
2010-06-15 15:55	alex	Changeset attached	1.1.x r13783
2010-06-15 15:53	Dmitry	Note Added: 0002470
2010-06-15 15:53	Dmitry	Assigned To	!COMMUNITY => alex
2010-06-15 15:53	Dmitry	Status	needs testing => reviewed and tested
2010-06-15 14:56	alex	File Added: home_category_phrase_separated_core_addon1.patch
2010-06-15 13:18	alex	Note Added: 0002462
2010-06-15 13:18	alex	File Added: home_category_phrase_separated_modules.patch
2010-06-15 13:12	alex	Note Added: 0002461
2010-06-15 13:12	alex	Assigned To	=> !COMMUNITY
2010-06-15 13:12	alex	Developer	=> alex
2010-06-15 13:12	alex	Status	active => needs testing
2010-06-15 13:10	alex	File Added: home_category_phrase_separated_themes.patch
2010-06-15 13:10	alex	File Added: home_category_phrase_separated_core.patch
2010-06-14 15:11	Dmitry	Description Updated	View Revisions
2010-06-13 23:24	Dmitry	New Issue

Web Development by Intechnic

In-Portal Open Source CMS