Correctly translate name of library using Joomla! language sys file.

joomla · Oct 1, 2014 · fcce18b · fcce18b
1 parent 696b4c2
commit fcce18b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/administrator/components/com_installer/models/extension.php b/administrator/components/com_installer/models/extension.php
@@ -169,7 +169,7 @@ private function translate(&$items)
 					||	$lang->load("$extension.sys", $source, null, false, true);
 				break;
 			}
-			if (!in_array($item->type, array('language', 'template', 'library')))
+			if (!in_array($item->type, array('language', 'template')))
 			{
 				$item->name = JText::_($item->name);
 			}

diff --git a/libraries/cms/installer/adapter/library.php b/libraries/cms/installer/adapter/library.php
@@ -40,7 +40,7 @@ public function loadLanguage($path = null)
 		}
 
 		$this->manifest = $this->parent->getManifest();
-		$extension = 'lib_' . strtolower(JFilterInput::getInstance()->clean((string) $this->manifest->name, 'cmd'));
+		$extension = strtolower(JFilterInput::getInstance()->clean((string) $this->manifest->name, 'cmd'));
 		$name = strtolower((string) $this->manifest->libraryname);
 		$lang = JFactory::getLanguage();
 		$source = $path ? $path : JPATH_PLATFORM . "/$name";

diff --git a/tests/unit/suites/libraries/cms/installer/data/joomla.xml b/tests/unit/suites/libraries/cms/installer/data/joomla.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="library" version="2.5">
-    <name>Joomla! Platform</name>
+    <name>lib_joomla</name>
     <libraryname>joomla</libraryname>
     <version>11.4</version>
     <description>LIB_JOOMLA_XML_DESCRIPTION</description>

diff --git a/tests/unit/suites/libraries/cms/installer/manifest/JInstallerManifestLibraryTest.php b/tests/unit/suites/libraries/cms/installer/manifest/JInstallerManifestLibraryTest.php
@@ -35,7 +35,7 @@ public function testLoadManifestFromData()
 		$this->object = new JInstallerManifestLibrary(dirname(__DIR__) . '/data/joomla.xml');
 
 		$this->assertEquals(
-			'Joomla! Platform',
+			'lib_joomla',
 			$this->object->name
 		);