From f4fd1a787e3fda0c7f07b849f5cc4c95a12a1996 Mon Sep 17 00:00:00 2001 From: Jurian Even Date: Thu, 28 Feb 2013 08:36:38 +0100 Subject: [PATCH 01/19] # [#30100] Plugins ordering broken when search filter is populated. Thanks Jurian --- administrator/components/com_plugins/models/plugins.php | 5 ++++- installation/CHANGELOG | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php index 0d94905303c53..0ff07d0f5add7 100644 --- a/administrator/components/com_plugins/models/plugins.php +++ b/administrator/components/com_plugins/models/plugins.php @@ -128,8 +128,11 @@ protected function _getList($query, $limitstart=0, $limit=0) } } } + $lang = JFactory::getLanguage(); - JArrayHelper::sortObjects($result, 'name', $this->getState('list.direction') == 'desc' ? -1 : 1, true, $lang->getLocale()); + $direction = ($this->getState('list.direction') == 'desc') ? -1 : 1; + JArrayHelper::sortObjects($result, $ordering, $direction, true, $lang->getLocale()); + $total = count($result); $this->cache[$this->getStoreId('getTotal')] = $total; if ($total < $limitstart) { diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 19ab4fda3f3a7..97487cb335b71 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,7 +26,10 @@ $ -> Language fix or change - -> Removed ! -> Note -09-February-2013 Michael Babker +28-Feb-2013 Jean-Marie Simonet +# [#30100] Plugins ordering broken when search filter is populated. Thanks Jurian + +09-Feb-2013 Michael Babker # [#29970] Robots.txt check url no more working. Thanks Brian -------------------- 2.5.9 Stable Release [4-February-2013] ------------------ From 5bb4e65abd50d63f599e13d6076dd09d76d365bb Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Thu, 28 Feb 2013 08:46:55 +0100 Subject: [PATCH 02/19] # [#29968] Only text gets passed to content events in blog view (for Joomla 2.5.x). Thanks Jonathan. --- .../com_content/views/category/view.html.php | 18 ++++++++++++++---- .../com_content/views/featured/view.html.php | 17 +++++++++++++---- installation/CHANGELOG | 3 ++- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php index 0f34e1f8f4f10..0378e612ac2f2 100644 --- a/components/com_content/views/category/view.html.php +++ b/components/com_content/views/category/view.html.php @@ -89,15 +89,25 @@ function display($tpl = null) $dispatcher = JDispatcher::getInstance(); - $item->introtext = JHtml::_('content.prepare', $item->introtext, '', 'com_content.category'); + // Old plugins: Ensure that text property is available + if (!isset($item->text)) + { + $item->text = $item->introtext; + } + + JPluginHelper::importPlugin('content'); + $results = $dispatcher->trigger('onContentPrepare', array ('com_content.category', &$item, &$this->params, 0)); + + // Old plugins: Use processed text as introtext + $item->introtext = $item->text; - $results = $dispatcher->trigger('onContentAfterTitle', array('com_content.article', &$item, &$item->params, 0)); + $results = $dispatcher->trigger('onContentAfterTitle', array('com_content.category', &$item, &$item->params, 0)); $item->event->afterDisplayTitle = trim(implode("\n", $results)); - $results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.article', &$item, &$item->params, 0)); + $results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.category', &$item, &$item->params, 0)); $item->event->beforeDisplayContent = trim(implode("\n", $results)); - $results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.article', &$item, &$item->params, 0)); + $results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.category', &$item, &$item->params, 0)); $item->event->afterDisplayContent = trim(implode("\n", $results)); } diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php index 9c509ba28a46e..332db2e7251d1 100644 --- a/components/com_content/views/featured/view.html.php +++ b/components/com_content/views/featured/view.html.php @@ -70,15 +70,24 @@ function display($tpl = null) $dispatcher = JDispatcher::getInstance(); - $item->introtext = JHtml::_('content.prepare', $item->introtext, '', 'com_content.featured'); + // Old plugins: Ensure that text property is available + if (!isset($item->text)) + { + $item->text = $item->introtext; + } + JPluginHelper::importPlugin('content'); + $results = $dispatcher->trigger('onContentPrepare', array ('com_content.featured', &$item, &$this->params, 0)); + + // Old plugins: Use processed text as introtext + $item->introtext = $item->text; - $results = $dispatcher->trigger('onContentAfterTitle', array('com_content.article', &$item, &$item->params, 0)); + $results = $dispatcher->trigger('onContentAfterTitle', array('com_content.featured', &$item, &$item->params, 0)); $item->event->afterDisplayTitle = trim(implode("\n", $results)); - $results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.article', &$item, &$item->params, 0)); + $results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.featured', &$item, &$item->params, 0)); $item->event->beforeDisplayContent = trim(implode("\n", $results)); - $results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.article', &$item, &$item->params, 0)); + $results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.featured', &$item, &$item->params, 0)); $item->event->afterDisplayContent = trim(implode("\n", $results)); } diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 97487cb335b71..8fac4ac2f6ef3 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -27,7 +27,8 @@ $ -> Language fix or change ! -> Note 28-Feb-2013 Jean-Marie Simonet -# [#30100] Plugins ordering broken when search filter is populated. Thanks Jurian + # [#30100] Plugins ordering broken when search filter is populated. Thanks Jurian + # [#29968] Only text gets passed to content events in blog view (for Joomla 2.5.x). Thanks Jonathan. 09-Feb-2013 Michael Babker # [#29970] Robots.txt check url no more working. Thanks Brian From 704d5bd8122071f1905d465e9431e1f7db5ba2b6 Mon Sep 17 00:00:00 2001 From: Nicholas Antimisiaris Date: Tue, 5 Mar 2013 09:39:40 +0100 Subject: [PATCH 03/19] + [#29769] com_config component missing triggers on save. Thanks Nicholas Antimisiaris --- .../com_config/models/component.php | 54 ++++++++++++++++--- installation/CHANGELOG | 3 ++ 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/administrator/components/com_config/models/component.php b/administrator/components/com_config/models/component.php index f6c2a9548772f..ec9736e97d1f2 100644 --- a/administrator/components/com_config/models/component.php +++ b/administrator/components/com_config/models/component.php @@ -17,6 +17,22 @@ */ class ConfigModelComponent extends JModelForm { + /** + * The event to trigger before saving the data. + * + * @var string + * @since 2.5.10 + */ + protected $event_before_save = 'onConfigurationBeforeSave'; + + /** + * The event to trigger before deleting the data. + * + * @var string + * @since 2.5.10 + */ + protected $event_after_save = 'onConfigurationAfterSave'; + /** * Method to auto-populate the model state. * @@ -68,7 +84,8 @@ public function getForm($data = array(), $loadData = true) '/config' ); - if (empty($form)) { + if (empty($form)) + { return false; } @@ -108,14 +125,18 @@ function getComponent() */ public function save($data) { + $dispatcher = JDispatcher::getInstance(); $table = JTable::getInstance('extension'); + $isNew = true; // Save the rules. - if (isset($data['params']) && isset($data['params']['rules'])) { + if (isset($data['params']) && isset($data['params']['rules'])) + { $rules = new JAccessRules($data['params']['rules']); $asset = JTable::getInstance('asset'); - if (!$asset->loadByName($data['option'])) { + if (!$asset->loadByName($data['option'])) + { $root = JTable::getInstance('asset'); $root->loadByName('root.1'); $asset->name = $data['option']; @@ -124,7 +145,8 @@ public function save($data) } $asset->rules = (string) $rules; - if (!$asset->check() || !$asset->store()) { + if (!$asset->check() || !$asset->store()) + { $this->setError($asset->getError()); return false; } @@ -135,7 +157,8 @@ public function save($data) } // Load the previous Data - if (!$table->load($data['id'])) { + if (!$table->load($data['id'])) + { $this->setError($table->getError()); return false; } @@ -143,19 +166,31 @@ public function save($data) unset($data['id']); // Bind the data. - if (!$table->bind($data)) { + if (!$table->bind($data)) + { $this->setError($table->getError()); return false; } // Check the data. - if (!$table->check()) { + if (!$table->check()) + { + $this->setError($table->getError()); + return false; + } + + // Trigger the oonConfigurationBeforeSave event. + $result = $dispatcher->trigger($this->event_before_save, array($this->option . '.' . $this->name, $table, $isNew)); + + if (in_array(false, $result, true)) + { $this->setError($table->getError()); return false; } // Store the data. - if (!$table->store()) { + if (!$table->store()) + { $this->setError($table->getError()); return false; } @@ -163,6 +198,9 @@ public function save($data) // Clean the component cache. $this->cleanCache('_system'); + // Trigger the onConfigurationAfterSave event. + $dispatcher->trigger($this->event_after_save, array($this->option . '.' . $this->name, $table, $isNew)); + return true; } } diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 8fac4ac2f6ef3..49f46a14bb80a 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +05-Mar-2013 Jean-Marie Simonet + + [#29769] com_config component missing triggers on save. Thanks Nicholas Antimisiaris + 28-Feb-2013 Jean-Marie Simonet # [#30100] Plugins ordering broken when search filter is populated. Thanks Jurian # [#29968] Only text gets passed to content events in blog view (for Joomla 2.5.x). Thanks Jonathan. From 52b4f71df5d7b6c2e7bdcf7f28fe26914a3c5d17 Mon Sep 17 00:00:00 2001 From: Akarawuth Tamrareang Date: Sat, 16 Mar 2013 10:51:52 +0100 Subject: [PATCH 04/19] +$ [#27945] Hide Subcategories text. Thanks Aka. --- administrator/components/com_content/config.xml | 8 +++++++- administrator/language/en-GB/en-GB.ini | 2 ++ components/com_content/views/category/tmpl/blog.php | 6 ++++-- components/com_content/views/category/tmpl/blog.xml | 9 ++++++++- components/com_content/views/category/tmpl/default.php | 3 ++- components/com_content/views/category/tmpl/default.xml | 9 ++++++++- installation/CHANGELOG | 3 +++ templates/beez5/html/com_content/category/blog.php | 6 ++++-- templates/beez5/html/com_content/category/default.php | 9 +++++---- 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml index c8a3f483ac076..bf49bfb1415ee 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -427,7 +427,13 @@ extension="com_content" view="category" /> - + + + + children[$this->category->id])&& $this->maxLevel != 0) : ?>
+ params->get('show_category_heading_title_text', 1) == 1) : ?>

- -

+ + + loadTemplate('children'); ?>
diff --git a/components/com_content/views/category/tmpl/blog.xml b/components/com_content/views/category/tmpl/blog.xml index ea5a0d43b579a..208f69e47be19 100644 --- a/components/com_content/views/category/tmpl/blog.xml +++ b/components/com_content/views/category/tmpl/blog.xml @@ -31,7 +31,14 @@ type="hidden" default="blog" /> - + + + + + children[$this->category->id])&& $this->maxLevel != 0) : ?>
+ params->get('show_category_heading_title_text', 1) == 1) : ?>

- + loadTemplate('children'); ?>
diff --git a/components/com_content/views/category/tmpl/default.xml b/components/com_content/views/category/tmpl/default.xml index 6ca89166177df..60567fbfc9d1a 100644 --- a/components/com_content/views/category/tmpl/default.xml +++ b/components/com_content/views/category/tmpl/default.xml @@ -26,7 +26,14 @@
- + + + + + Language fix or change - -> Removed ! -> Note +16-Mar-2013 Jean-Marie Simonet + +$ [#27945] Hide Subcategories text. Thanks Aka. + 05-Mar-2013 Jean-Marie Simonet + [#29769] com_config component missing triggers on save. Thanks Nicholas Antimisiaris diff --git a/templates/beez5/html/com_content/category/blog.php b/templates/beez5/html/com_content/category/blog.php index a6c9c6e2e9b6b..916827f1e7f6d 100644 --- a/templates/beez5/html/com_content/category/blog.php +++ b/templates/beez5/html/com_content/category/blog.php @@ -106,9 +106,11 @@ children[$this->category->id]) && count($this->children[$this->category->id]) > 0 && $this->params->get('maxLevel') !=0) : ?>
+ params->get('show_category_heading_title_text', 1) == 1) : ?>

- -

+ + + loadTemplate('children'); ?>
diff --git a/templates/beez5/html/com_content/category/default.php b/templates/beez5/html/com_content/category/default.php index 326447d8f68e2..266503312c14b 100644 --- a/templates/beez5/html/com_content/category/default.php +++ b/templates/beez5/html/com_content/category/default.php @@ -63,14 +63,15 @@ params->get('show_category_title') or $this->params->get('page_subheading')) { echo '

' ;} - else + elseif ($this->params->get('show_category_heading_title_text', 1) == 1) {echo '

' ;} ?> - - + params->get('show_category_heading_title_text', 1) == 1) : ?> + + params->get('show_category_title') or $this->params->get('page_subheading')) { echo '

' ;} - else + elseif ($this->params->get('show_category_heading_title_text', 1) == 1) {echo '' ;} ?> loadTemplate('children'); ?> From cfdd5507c767723a9c3d8ad6c60f49b6cbaab5f8 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Sat, 16 Mar 2013 13:57:09 -0400 Subject: [PATCH 05/19] # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. --- components/com_content/views/category/tmpl/blog_item.php | 3 +++ components/com_content/views/featured/tmpl/default_item.php | 2 ++ installation/CHANGELOG | 3 +++ 3 files changed, 8 insertions(+) diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php index c173927c51344..b770d4cfd665e 100644 --- a/components/com_content/views/category/tmpl/blog_item.php +++ b/components/com_content/views/category/tmpl/blog_item.php @@ -134,7 +134,10 @@ src="image_intro); ?>" alt="image_intro_alt); ?>"/> + +get('show_intro')) : ?> item->introtext; ?> + get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php index 1dc46f972116b..cae79e3b1daf8 100644 --- a/components/com_content/views/featured/tmpl/default_item.php +++ b/components/com_content/views/featured/tmpl/default_item.php @@ -134,7 +134,9 @@ +get('show_intro')) : ?> item->introtext; ?> + get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : diff --git a/installation/CHANGELOG b/installation/CHANGELOG index bbe9f5eb4f8a3..514550cf598e5 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +16-Mar-2013 Michael Babker + # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. Thanks Matt + 16-Mar-2013 Jean-Marie Simonet +$ [#27945] Hide Subcategories text. Thanks Aka. From c24eaed39ee56b60226fffb94075310c78d8fc05 Mon Sep 17 00:00:00 2001 From: Mark Dexter Date: Sun, 17 Mar 2013 17:28:29 +0100 Subject: [PATCH 06/19] #+ [#29677] robots.txt in updates. Thanks Mark --- build/build.php | 4 ++-- installation/CHANGELOG | 3 +++ installation/controllers/setup.json.php | 17 +++++++++++++++++ robots.txt => robots.txt.dist | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) rename robots.txt => robots.txt.dist (93%) diff --git a/build/build.php b/build/build.php index cdb057df19b53..6de5330dd7998 100644 --- a/build/build.php +++ b/build/build.php @@ -90,7 +90,7 @@ "tmp/index.html\n" => true, "htaccess.txt\n" => true, "web.config.txt\n" => true, - "robots.txt\n" => true, + "robots.txt.dist\n" => true, "LICENSE.txt\n" => true, "README.txt\n" => true, "index.php\n" => true, @@ -140,7 +140,7 @@ echo "Skipping create archive for version $version.$num\n"; continue; } - + $fromName = $num == 0 ? 'x' : $num; // Create the diff archive packages using the file name list. system('tar --create --bzip2 --no-recursion --directory '.$full.' --file packages'.$version.'/Joomla_'.$version.'.'.$fromName.'_to_'.$full.'-Stable-Patch_Package.tar.bz2 --files-from diffconvert/'.$version.'.'.$num . '> /dev/null'); diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 514550cf598e5..7858ecd3666c8 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +17-Mar-2013 Jean-Marie Simonet +#+ [#29677] robots.txt in updates. Thanks Mark + 16-Mar-2013 Michael Babker # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. Thanks Matt diff --git a/installation/controllers/setup.json.php b/installation/controllers/setup.json.php index 3d2a328fbabfc..76855de13fac3 100644 --- a/installation/controllers/setup.json.php +++ b/installation/controllers/setup.json.php @@ -445,6 +445,17 @@ public function removeFolder() } } + // Rename the robots.txt.dist file to robots.txt + if ($return) + { + $robotsFile = JPath::clean($options->ftp_root . '/robots.txt'); + $distFile = JPath::clean($options->ftp_root . '/robots.txt.dist'); + if (!file_exists($robotsFile) && file_exists($distFile)) + { + $return = $ftp->rename($distFile, $robotsFile); + } + } + $ftp->quit(); } else { // Try to delete the folder. @@ -455,6 +466,12 @@ public function removeFolder() ob_end_clean(); } + + // Rename the robots.txt.dist file if robots.txt doesn't exist + if ($return && !file_exists(JPATH_ROOT . '/robots.txt') && file_exists(JPATH_ROOT . '/robots.txt.dist')) + { + $return = JFile::move(JPATH_ROOT . '/robots.txt.dist', JPATH_ROOT . '/robots.txt'); + } // If an error was encountered return an error. if (!$return) { $this->sendResponse(new Exception(JText::_('INSTL_COMPLETE_ERROR_FOLDER_DELETE'), 500)); diff --git a/robots.txt b/robots.txt.dist similarity index 93% rename from robots.txt rename to robots.txt.dist index 6d0c523f957ca..814cc859108f5 100644 --- a/robots.txt +++ b/robots.txt.dist @@ -9,7 +9,7 @@ # http://www.robotstxt.org/orig.html # # For syntax checking, see: -# http://tool.motoricerca.info/robots-checker.phtml +# http://www.sxw.org.uk/computing/robots/check.html User-agent: * Disallow: /administrator/ From 1b501057e2b630df58a49455e11322599f36e55c Mon Sep 17 00:00:00 2001 From: Parth Lawate Date: Sun, 17 Mar 2013 17:50:25 +0100 Subject: [PATCH 07/19] + [#29294] Show Correct Meta Titles in Joomla Admin for better usability. Thanks Parth --- administrator/includes/toolbar.php | 2 ++ installation/CHANGELOG | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php index 4cf959461bc83..b39eb56ea07d2 100644 --- a/administrator/includes/toolbar.php +++ b/administrator/includes/toolbar.php @@ -39,6 +39,8 @@ public static function title($title, $icon = 'generic.png') $app = JFactory::getApplication(); $app->JComponentTitle = $html; + $doc = JFactory::getDocument(); + $doc->setTitle($app->getCfg('sitename'). ' - ' .JText::_('JADMINISTRATION').' - '.$title); } /** diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 7858ecd3666c8..27724b4ee927c 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -27,7 +27,8 @@ $ -> Language fix or change ! -> Note 17-Mar-2013 Jean-Marie Simonet -#+ [#29677] robots.txt in updates. Thanks Mark + #+ [#29677] robots.txt in updates. Thanks Mark + + [#29294] Show Correct Meta Titles in Joomla Admin for better usability. Thanks Parth 16-Mar-2013 Michael Babker # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. Thanks Matt From b9ac87a89ec225d58b911c88aa92808bb774f0f4 Mon Sep 17 00:00:00 2001 From: Elin Waring Date: Sun, 17 Mar 2013 18:02:52 +0100 Subject: [PATCH 08/19] # [#29810] File deletion issue. Thanks Elin --- installation/CHANGELOG | 1 + libraries/joomla/filesystem/folder.php | 11 +++++++++-- libraries/joomla/filesystem/path.php | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 27724b4ee927c..a9f3a941e66f6 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -29,6 +29,7 @@ $ -> Language fix or change 17-Mar-2013 Jean-Marie Simonet #+ [#29677] robots.txt in updates. Thanks Mark + [#29294] Show Correct Meta Titles in Joomla Admin for better usability. Thanks Parth + # [#29810] File deletion issue. Thanks Elin 16-Mar-2013 Michael Babker # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. Thanks Matt diff --git a/libraries/joomla/filesystem/folder.php b/libraries/joomla/filesystem/folder.php index 36018edea6087..8ba492bba360c 100644 --- a/libraries/joomla/filesystem/folder.php +++ b/libraries/joomla/filesystem/folder.php @@ -295,8 +295,15 @@ public static function delete($path) // Initialise variables. $FTPOptions = JClientHelper::getCredentials('ftp'); - // Check to make sure the path valid and clean - $path = JPath::clean($path); + try + { + // Check to make sure the path valid and clean + $path = JPath::clean($path); + } + catch (UnexpectedValueException $e) + { + throw new UnexpectedValueException($e); + } // Is this really a folder? if (!is_dir($path)) diff --git a/libraries/joomla/filesystem/path.php b/libraries/joomla/filesystem/path.php index 01d554e9a1495..d4c8bb9b12d35 100644 --- a/libraries/joomla/filesystem/path.php +++ b/libraries/joomla/filesystem/path.php @@ -171,7 +171,6 @@ public static function check($path, $ds = DIRECTORY_SEPARATOR) { if (strpos($path, '..') !== false) { - // Don't translate JError::raiseError(20, 'JPath::check Use of relative paths not permitted'); jexit(); } @@ -196,9 +195,15 @@ public static function check($path, $ds = DIRECTORY_SEPARATOR) * @return string The cleaned path. * * @since 11.1 + * @throws UnexpectedValueException */ public static function clean($path, $ds = DIRECTORY_SEPARATOR) { + if (!is_string($path)) + { + throw new UnexpectedValueException('JPath::clean: $path is not a string.'); + } + $path = trim($path); if (empty($path)) From 2537c8b03648d015db1058af17738c468d5cf7d2 Mon Sep 17 00:00:00 2001 From: chdemko Date: Sun, 17 Mar 2013 18:44:13 +0100 Subject: [PATCH 09/19] # [#28171] Com_content category view incorrect ordering of "featured" articles. Thanks Christophe Demko --- components/com_content/helpers/query.php | 2 +- installation/CHANGELOG | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php index e3484aabb275b..cb37e92f415c9 100644 --- a/components/com_content/helpers/query.php +++ b/components/com_content/helpers/query.php @@ -103,7 +103,7 @@ public static function orderbySecondary($orderby, $orderDate = 'created') break; case 'front' : - $orderby = 'fp.ordering'; + $orderby = 'a.featured DESC, fp.ordering'; break; default : diff --git a/installation/CHANGELOG b/installation/CHANGELOG index a9f3a941e66f6..ff8d8480e4e99 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -30,6 +30,7 @@ $ -> Language fix or change #+ [#29677] robots.txt in updates. Thanks Mark + [#29294] Show Correct Meta Titles in Joomla Admin for better usability. Thanks Parth # [#29810] File deletion issue. Thanks Elin + # [#28171] Com_content category view incorrect ordering of "featured" articles. Thanks Christophe Demko 16-Mar-2013 Michael Babker # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. Thanks Matt From 6d9ad20b744e88302f540a80a9f382e787c18acf Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sun, 17 Mar 2013 19:30:05 +0100 Subject: [PATCH 10/19] # [#30312] *Porting to 2.5.x a 3.x improvement in languagefilter --- .../en-GB/en-GB.plg_system_languagefilter.ini | 14 +++++---- installation/CHANGELOG | 2 +- .../system/languagefilter/languagefilter.php | 29 +++++++++++++++++-- .../system/languagefilter/languagefilter.xml | 9 ++++++ 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini index 510a6482a840b..dfd3044bc1d6f 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini @@ -4,16 +4,20 @@ ; Note : All ini files need to be saved as UTF-8 PLG_SYSTEM_LANGUAGEFILTER="System - Language Filter" -PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION="This plugin filters the displayed content depending on language.
This plugin is to be enabled only when the Language Switcher module is published.
If this plugin is activated, it is suggested to publish the administrator multilanguage status module." +PLG_SYSTEM_LANGUAGEFILTER_BROWSER_SETTINGS="Browser Settings" +PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternate meta tags for menu items with associated menu items in other languages." +PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_LABEL="Add alternate meta tags" PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_DESC="This option will automatically change the content language used in the frontend when a user site language is changed" PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_LABEL="Automatic Language Change" +PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_DESC="Language cookies can be set to expire at the end of the session or after a year. Default is a year." +PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_LABEL="Cookie Lifetime" PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_DESC="Choose Site default language or try to detect the browser settings language. It will default to site language if browser settings can't be found." PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_LABEL="Language Selection for new Visitors." -PLG_SYSTEM_LANGUAGEFILTER_BROWSER_SETTINGS="Browser Settings" -PLG_SYSTEM_LANGUAGEFILTER_SITE_LANGUAGE="Site Language" PLG_SYSTEM_LANGUAGEFILTER_FIELD_MENU_ASSOCIATIONS_DESC="This option will allow menu associations when switching from one language to another" PLG_SYSTEM_LANGUAGEFILTER_FIELD_MENU_ASSOCIATIONS_LABEL="Menu associations" PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_DESC="Remove the defined URL Language Code of the Content Language that corresponds to the default site language when Search Engine Friendly URLs is set to 'Yes'." PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_LABEL="Remove URL Language Code" -PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternate meta tags for menu items with associated menu items in other languages." -PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_LABEL="Add alternate meta tags" +PLG_SYSTEM_LANGUAGEFILTER_OPTION_SESSION="Session" +PLG_SYSTEM_LANGUAGEFILTER_OPTION_YEAR="Year" +PLG_SYSTEM_LANGUAGEFILTER_SITE_LANGUAGE="Site Language" +PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION="This plugin filters the displayed content depending on language.
This plugin is to be enabled only when the Language Switcher module is published.
If this plugin is activated, it is suggested to publish the administrator multilanguage status module." diff --git a/installation/CHANGELOG b/installation/CHANGELOG index ff8d8480e4e99..80a061ba57a58 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -30,7 +30,7 @@ $ -> Language fix or change #+ [#29677] robots.txt in updates. Thanks Mark + [#29294] Show Correct Meta Titles in Joomla Admin for better usability. Thanks Parth # [#29810] File deletion issue. Thanks Elin - # [#28171] Com_content category view incorrect ordering of "featured" articles. Thanks Christophe Demko + # [#30312] *Porting to 2.5.x a 3.x improvement in languagefilter 16-Mar-2013 Michael Babker # [#30249] Show Intro Text = Hide currently has no effect in Featured and Category menu items. Thanks Matt diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php index 05eb007d8ac24..32302749d3250 100644 --- a/plugins/system/languagefilter/languagefilter.php +++ b/plugins/system/languagefilter/languagefilter.php @@ -30,6 +30,8 @@ class plgSystemLanguageFilter extends JPlugin public function __construct(&$subject, $config) { + parent::__construct($subject, $config); + // Ensure that constructor is called one time self::$cookie = SID == ''; if (!self::$default_lang) { @@ -82,7 +84,7 @@ public function __construct(&$subject, $config) $conf = JFactory::getConfig(); $cookie_domain = $conf->get('config.cookie_domain', ''); $cookie_path = $conf->get('config.cookie_path', '/'); - setcookie(JApplication::getHash('language'), $lang_code, time() + 365 * 86400, $cookie_path, $cookie_domain); + setcookie(JApplication::getHash('language'), $lang_code, $this->getLangCookieTime(), $cookie_path, $cookie_domain); // set the request var JRequest::setVar('language', $lang_code); } @@ -355,7 +357,7 @@ public function onUserAfterSave($user, $isnew, $success, $msg) $conf = JFactory::getConfig(); $cookie_domain = $conf->get('config.cookie_domain', ''); $cookie_path = $conf->get('config.cookie_path', '/'); - setcookie(JApplication::getHash('language'), $lang_code, time() + 365 * 86400, $cookie_path, $cookie_domain); + setcookie(JApplication::getHash('language'), $lang_code, $this->getLangCookieTime(), $cookie_path, $cookie_domain); } } } @@ -402,7 +404,7 @@ public function onUserLogin($user, $options = array()) $conf = JFactory::getConfig(); $cookie_domain = $conf->get('config.cookie_domain', ''); $cookie_path = $conf->get('config.cookie_path', '/'); - setcookie(JApplication::getHash('language'), $lang_code, time() + 365 * 86400, $cookie_path, $cookie_domain); + setcookie(JApplication::getHash('language'), $lang_code, $this->getLangCookieTime(), $cookie_path, $cookie_domain); // Change the language code JFactory::getLanguage()->setLanguage($lang_code); @@ -507,4 +509,25 @@ public function onAfterDispatch() } } } + + /** + * Getting the Language Cookie settings + * + * @return string The cookie time. + * + * @since 3.0.4 + */ + private function getLangCookieTime() + { + if ($this->params->get('lang_cookie', 1) == 1) + { + $lang_cookie = time() + 365 * 86400; + } + else + { + $lang_cookie = 0; + } + + return $lang_cookie; + } } diff --git a/plugins/system/languagefilter/languagefilter.xml b/plugins/system/languagefilter/languagefilter.xml index 36649f96c8190..856de9034895d 100644 --- a/plugins/system/languagefilter/languagefilter.xml +++ b/plugins/system/languagefilter/languagefilter.xml @@ -52,6 +52,15 @@ + + + + Date: Mon, 18 Mar 2013 08:31:12 +0100 Subject: [PATCH 11/19] # [#26860] A Contact name *must not* be unique. Thanks Christophe --- administrator/components/com_contact/tables/contact.php | 9 --------- administrator/language/en-GB/en-GB.com_contact.ini | 1 - installation/CHANGELOG | 3 +++ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/administrator/components/com_contact/tables/contact.php b/administrator/components/com_contact/tables/contact.php index a08ae0f2bb838..a35a677bbdb92 100644 --- a/administrator/components/com_contact/tables/contact.php +++ b/administrator/components/com_contact/tables/contact.php @@ -115,15 +115,6 @@ function check() $this->setError(JText::_('COM_CONTACT_WARNING_PROVIDE_VALID_NAME')); return false; } - /** check for existing name */ - $query = 'SELECT id FROM #__contact_details WHERE name = '.$this->_db->Quote($this->name).' AND catid = '.(int) $this->catid; - $this->_db->setQuery($query); - - $xid = intval($this->_db->loadResult()); - if ($xid && $xid != intval($this->id)) { - $this->setError(JText::_('COM_CONTACT_WARNING_SAME_NAME')); - return false; - } if (empty($this->alias)) { $this->alias = $this->name; diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index f2d17aea11a50..f0fae2e57082a 100644 --- a/administrator/language/en-GB/en-GB.com_contact.ini +++ b/administrator/language/en-GB/en-GB.com_contact.ini @@ -269,7 +269,6 @@ COM_CONTACT_UNFEATURED="Unfeatured contact" COM_CONTACT_WARNING_CATEGORY="This category is invalid" COM_CONTACT_WARNING_PROVIDE_VALID_NAME="Please provide a valid name" COM_CONTACT_WARNING_PROVIDE_VALID_URL="Please provide a valid URL" -COM_CONTACT_WARNING_SAME_NAME="The name of this contact is already used. Please enter another name" COM_CONTACT_WARNING_SELECT_CONTACT_TOPUBLISH="Please select a contact to publish" COM_CONTACT_XML_DESCRIPTION="This component shows a listing of contact information" JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved." diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 80a061ba57a58..680a00f33266d 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +18-Mar-2013 Jean-Marie Simonet + # [#26860] A Contact name *must not* be unique. Thanks Christophe + 17-Mar-2013 Jean-Marie Simonet #+ [#29677] robots.txt in updates. Thanks Mark + [#29294] Show Correct Meta Titles in Joomla Admin for better usability. Thanks Parth From c77496fcf5030de271f790e75ac97eadc2547abc Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Mon, 18 Mar 2013 18:39:46 +0100 Subject: [PATCH 12/19] $ Updating Swahili intallation ini file --- installation/CHANGELOG | 1 + installation/language/sw-KE/sw-KE.ini | 130 +++++++++++++------------- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 680a00f33266d..5892e94fd67fc 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -28,6 +28,7 @@ $ -> Language fix or change 18-Mar-2013 Jean-Marie Simonet # [#26860] A Contact name *must not* be unique. Thanks Christophe + $ Updating Swahili intallation ini file 17-Mar-2013 Jean-Marie Simonet #+ [#29677] robots.txt in updates. Thanks Mark diff --git a/installation/language/sw-KE/sw-KE.ini b/installation/language/sw-KE/sw-KE.ini index e10f27f8358ef..e85891d8d1c7e 100644 --- a/installation/language/sw-KE/sw-KE.ini +++ b/installation/language/sw-KE/sw-KE.ini @@ -1,14 +1,14 @@ -; Joomla! Project +; Joomla! Project ; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 -;Hatua ya maendeleo +;Upau wa hatua INSTL_STEPS_TITLE="Hatua" INSTL_STEP_1_LABEL="1 : Lugha" -INSTL_STEP_2_LABEL="2 : Kagua kabla ya uwekaji" +INSTL_STEP_2_LABEL="2 : Kagua kabla ya kusakinisha" INSTL_STEP_3_LABEL="3 : Leseni" INSTL_STEP_4_LABEL="4 : Hifadhidata" INSTL_STEP_5_LABEL="5 : Usaidini wa FTP" @@ -17,18 +17,18 @@ INSTL_STEP_7_LABEL="7 : Maliza" ;Mtazamo wa lugha INSTL_LANGUAGE_TITLE="Chagua lugha" -INSTL_SELECT_LANGUAGE_DESC="Tafadhali chagua lugha ya kutumia wakati wa hatua za ufungaji Joomla!:" +INSTL_SELECT_LANGUAGE_DESC="Tafadhali chagua lugha ya kutumia wakati wa hatua za kusakinisha Joomla!:" INSTL_SELECT_LANGUAGE_TITLE="Chagua lugha" -INSTL_WARNJAVASCRIPT="Ilani! JavaScript lazima kuwezeshwa kwa ufungaji wa Joomla! vizuri." -INSTL_WARNJSON="JSON nilazima iwezeshwe katika mfumo wako wa PHP kabla ya kuweka Joomla!" +INSTL_WARNJAVASCRIPT="Ilani! JavaScript lazima kuwezeshwa kwa kusakinisha Joomla! vizuri." +INSTL_WARNJSON="JSON nilazima iwezeshwe katika mfumo wako wa PHP kabla ya kusakinisha Joomla!" -;Mtazamo kabla ya ufungaji -INSTL_PRECHECK_TITLE="Kagua kabla ya ufungaji" -INSTL_PRECHECK_FOR_VERSION="Kagua kabla ya ufungaji kwa %s:" -INSTL_PRECHECK_DESC="Kama mojawapo ya vitu hivi haviungwimkono (alama kama hapana) alafu tafadhali chukua hatua ya kurekebisha. Ikiwa hautafanya hivi, ufungaji wako wa Joomla! hautafanya kazi vizuri. " +;Mtazamo kabla ya kusakinisha +INSTL_PRECHECK_TITLE="Kagua kabla ya kusakinisha" +INSTL_PRECHECK_FOR_VERSION="Kagua kabla ya kusakinisha kwa %s:" +INSTL_PRECHECK_DESC="Kama mojawapo ya vitu hivi haviungwimkono (alama kama hapana) alafu tafadhali chukua hatua ya kurekebisha. Ikiwa hautafanya hivi, usakinishaji wako wa Joomla! hautafanya kazi vizuri. " INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Matayarisho yanayopendekezwa:" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Matayarisho haya yaliyopendekezwa kwa PHP ili kuhakisha kwa utangamano kamili na Joomla.
Hatakama, Joomla! itaendelea kufanya kazi hataikiwa matayarisho yako hayalingani na yaliyopendekezwa." -INSTL_PRECHECK_DIRECTIVE="Amri" +INSTL_PRECHECK_DIRECTIVE="Maagizo (kama maelekezaji)" INSTL_PRECHECK_RECOMMENDED="Yaliyopendekezwa" INSTL_PRECHECK_ACTUAL="Halisi" @@ -36,10 +36,10 @@ INSTL_PRECHECK_ACTUAL="Halisi" INSTL_DATABASE="Upangaji wa hifadhidata" INSTL_DATABASE_HOST_DESC="Hii ni ya kawaida "localhost"" INSTL_DATABASE_HOST_LABEL="Jina la hosti" -INSTL_DATABASE_NAME_DESC="Baadhi ya hosti zinaruhusu jina mmoja la hifadhidata pekee kwa tovuti moja. Katika hali hii, tumia prefix ya jedwali kwa tovuti tofauti ya Joomla!" +INSTL_DATABASE_NAME_DESC="Baadhi ya hosti zinaruhusu jina mmoja la hifadhidata pekee kwa tovuti moja. Katika hali hii, tumia prefix ya jedwali kwa tovuti tofauti za Joomla!" INSTL_DATABASE_NAME_LABEL="Jina la hifadhidata" INSTL_DATABASE_NO_SCHEMA="Hakuna muundo wa hifadhidata kwa aina hii ya hifadhidata." -INSTL_DATABASE_OLD_PROCESS_DESC="Itabadilishwa jedwali yoyote ya backup kutoka kwa ufungaji wa zamani wa Joomla!" +INSTL_DATABASE_OLD_PROCESS_DESC="Itabadilisha jedwali yoyote ya backup kutoka kwa usakinishaji wa zamani wa Joomla!" INSTL_DATABASE_OLD_PROCESS_LABEL="Maandao ya zamani ya hifadhidata" INSTL_DATABASE_PASSWORD_DESC="Kwa usalama wa tovuti, nilazima kutumia nenosiri kwa akaunti ya mysql" INSTL_DATABASE_PASSWORD_LABEL="Nenosiri" @@ -50,20 +50,20 @@ INSTL_DATABASE_TYPE_DESC="Pengine ni hii "MySQLi"" INSTL_DATABASE_TYPE_LABEL="Aina ya hifadhidata" INSTL_DATABASE_USER_DESC="Pengine kitu kama "_QQ_"root"_QQ_" au jina la mtumiaji lililopeanwa na hosti" INSTL_DATABASE_USER_LABEL="Jina la mtumiaji" -INSTL_DATABASE_TITLE="Matayarisho wa uhusiano" -INSTL_DATABASE_DESC="

Tovuti ya Joomla! inahifadhi data zote ndani ya hifadhidata. Skrini hii inapeana programu ya kuweka na maelezo yanayohusika kwa kutengeneza hifadhidata hii.

Ikiwa unaweka Joomla! katika seva ya tovuti ya nje, utahitaji maelezo haya kutoka kwa hosti yako.

Hosti zingine za tovuti zinaitaji kama wewe unatengeneza hifadhidata kabla hujaweka Joomla. Ikiwa utapata ujumbe "_QQ_"Haikuweza kukuunganisha na hifadhidata"_QQ_", sahihi jina lako la mtumiaji na nenosiri. Ikiwa bado utatapa ujumbe huu, sahihi na hosti yako na uangalie ikiwa unatakiwa kurekebisha hifadhidata kabla ya kuweka Joomla.

" +INSTL_DATABASE_TITLE="Matayarisho ya uhusiano" +INSTL_DATABASE_DESC="

Tovuti ya Joomla! Inahifadhi data zote ndani ya hifadhidata. Skrini hii inapeana programu ya kusakinisha maelezo yanayohusika kwa kutengeza hifadhidata hii.

Ikiwa unasakinisha Joomla! katika seva ya tovuti ya nje, utahitaji maelezo haya kutoka kwa hosti yako.

Hosti zingine za tovuti zinaitaji kama wewe unatengeza hifadhidata kabla ya kusakinisha Joomla. Ikiwa utapata ujumbe "_QQ_"Haikuweza kukuunganisha na hifadhidata"_QQ_", sahihi jina lako la mtumiaji na nenosiri. Ikiwa bado utatapa ujumbe huu, sahihi na hosti yako na uangalie ikiwa unatakiwa kurekebisha hifadhidata kabla ya kusakinisha Joomla.

" ;Mtazamo wa mfumo wa mafaili -INSTL_AUTOFIND_FTP_PATH="Namna ya kupata njia ya FTP" +INSTL_AUTOFIND_FTP_PATH="Kujipatiayenyewe njia ya FTP" INSTL_FTP="Usanidi wa FTP" -INSTL_FTP_DESC="

Katika baadhi ya seva, pengine nilazima upeane sifa za FTP kwa kumaliza unfungaji. Ikiwa una matatizo kwa kumaliza ufungaji, angalia katika hosti yako kwa kuamua kama hii ni muhimu.

Kwa sababu ya usalama, ni vizuri kutengeneza akaunti tofauti ya mtumiaji wa FTP ambayo itatumika na ufungaji wa Joomla! pekeake, sio seva nzima ya tovuti. Hosti yako itakusaidia kwa hii.

Kumbuko: Ikiwa unaweka katika mfumo wa maendeshaji ya Windows, kiwango cha FTP sio.

" +INSTL_FTP_DESC="

Katika baadhi ya seva, pengine nilazima upeane sifa za FTP kwa kumaliza usakinishaji. Ikiwa una matatizo kwa kumaliza usakinishaji, angalia katika hosti yako kwa kuamua kama hii ni muhimu.

Kwa sababu ya usalama, ni vizuri kutengeza akaunti tofauti ya mtumiaji wa FTP ambayo itatumika kwa kusakinisha Joomla! pekee, sio seva nzima ya tovuti. Hosti yako itakusaidia kwa hii.

Kumbuko: Ikiwa unaweka katika mfumo wa maendeshaji ya Windows, kiwango cha FTP sio.

" INSTL_FTP_ENABLE_LABEL="Mpango wa FTP unawezekana" INSTL_FTP_HOST_LABEL="Hosti ya FTP" INSTL_FTP_PASSWORD_LABEL="Nenosiri la FTP" INSTL_FTP_PORT_LABEL="Poti ya FTP" -INSTL_FTP_ROOT_LABEL="Njia ya mzizi ya FTP" +INSTL_FTP_ROOT_LABEL="Njia ya enzi ya FTP" INSTL_FTP_SAVE_LABEL="Hifadhi nenosiri la FTP" -INSTL_FTP_TITLE="Matayarisho ya FTP (Hiari - watumiaji wengi wairuka hii hatua kwa kubonyeza nyingine)" +INSTL_FTP_TITLE="Matayarisho ya FTP (Hiari - watumiaji wengi wanairuka hii hatua kwa kubonyeza nyingine)" INSTL_FTP_USER_LABEL="Jina la mtumiaji la FTP" INSTL_SITE_NAME_LABEL="Jina la tovuti" INSTL_VERIFY_FTP_SETTINGS="Thibitisha matayarisho ya FTP" @@ -72,32 +72,32 @@ INSTL_FTP_USER_DESC="Onyo! Unashauriwa kuacha sehemu hii tupu kwa kilawakati wa INSTL_FTP_PASSWORD_DESC="Onyo! Unashauriwa kuacha sehemu hii tupu kwa kilawakati wa kuhamish faili zako katika kuingiza neno siri kwa FTP." ;Mtazamo wa tovuti -INSTL_SITE="Matayarisho makubwa" +INSTL_SITE="Usanidi mkubwa" INSTL_ADMIN_EMAIL_LABEL="Barua pepe yako" INSTL_ADMIN_PASSWORD_LABEL="Nenosiri la msimamizi" INSTL_ADMIN_PASSWORD2_LABEL="Hakikisha nenosiri la msimamizi" INSTL_ADMIN_USER_LABEL="Jina la msimamizi" INSTL_SITE_NAME_TITLE="Jina la tovuti" INSTL_SITE_META_ADVANCED_SETTINGS="Usanidi wa kina - hiari" -INSTL_SITE_NAME_DESC="Weka jina la tovuti yako ya Joomla!
Hiari:
Unaweza kuweka maelezo ya meta na funguo za maneno muhimu ya meta kwa tovuti yako.
Unaweza pia kuamua ikiwa upande wa mbele wa tovuti utapatikana au sio kwa haraka baada ya kumalizwa ufungaji." +INSTL_SITE_NAME_DESC="Weka jina la tovuti yako la Joomla!
Hiari:
Unaweza kuweka maelezo ya meta na funguo za maneno muhimu ya meta kwa tovuti yako.
Unaweza pia kuamua ikiwa upande wa mbele wa tovuti utapatikana au sio kwa haraka baada ya kumalizwa usakinishaji." INSTL_SITE_METADESC_LABEL="Fafanuo la meta" -INSTL_SITE_METADESC_TITLE_LABEL="Weka maelezo yote kwa jumla kwa tovuti ambayo itaweza kutafutwa na mashini. Ujumla, kiwango cha maneno 20 bora." +INSTL_SITE_METADESC_TITLE_LABEL="Weka fafanuo la tovuti kwa jumla ambalo litatumiwa na mashini ya kutafuta. Kwa jumla, kiwango cha maneno 20 bora." INSTL_SITE_METAKEYS_LABEL="Maneno muhimu ya meta" INSTL_SITE_METAKEYS_TITLE_LABEL="Weka maneno muhimu na misemo ambayo imeeleza tovuti yako vizuri. Tenga maneno na misemo ya coma." INSTL_SITE_CONF_TITLE="Hakikisha barua pepe ya msimamizi na nenosiri." -INSTL_SITE_CONF_DESC="Weka barua pepe yako. Hii ndiyo itakuwa anwani ya barua pepe ya msimamizi mkubwa wa tovuti.
Weka nenosiri jipya na hakikisha ndani ya maeneo yanayofaa. Unaweza kubadilisha jina la mtumiaji la difoti admin. Hili litakuwa ni jina la mtumiaji na nenosiri utakalotumia kwa kuingia ndani ya paneli ya msimamizi mwisho wa ufunguaji.
Ikiwa unahama, unaweza kupuuza sehemu hii. Matayarisho yako ya sasa yatahamishwa moja kwa moja." +INSTL_SITE_CONF_DESC="Weka barua pepe yako. Hii ndiyo itakuwa anwani ya barua pepe ya msimamizi mkubwa wa tovuti.
Weka nenosiri jipya na hakikisha ndani ya maeneo yanayofaa. Unaweza kubadilisha jina la mtumiaji la difoti admin. Hili litakuwa ni jina la mtumiaji na nenosiri utakalotumia kwa kuingia ndani ya paneli ya msimamizi mwisho wa usakinishaji.
Ikiwa unahama, unaweza kupuuza sehemu hii. Matayarisho yako ya sasa yatahamishwa moja kwa moja." INSTL_SITE_LOAD_SAMPLE_TITLE="Pakia data za mfano" -INSTL_SITE_LOAD_SAMPLE_DESC1="Muhimu!: Yenye nguvu imekubaliwa kua watumiaji wapya wa Joomla! wanaweka data za mfano wa difoti. Kunfanya hivi, bofya kibonyezo kabla ya kusongea kwa sehemu nyingine." -INSTL_SITE_LOAD_SAMPLE_DESC2="1. Data za mfano: Kabla ya kuacha ufungaji, unaweza kuweka data ndani ya tovuti. Ni aina mbili za kufanya hivi:" -INSTL_SITE_LOAD_SAMPLE_DESC3="1a. Data za mfano wa difoti zaweza kuingizwa. Kufanya hivi, hakikisha kuwa data za mfano wa Default English (GB) zinaonyeshwa ndani ya orodha ya kunjuzi na bofya 'Weka data za mfano'." -INSTL_SITE_LOAD_SAMPLE_DESC4="1b. Data za mfano wa desturi zaweza kuwekwa. Kufanya hivi, chagua data za mfano zinazopatikana ndani ya orodha ya kunjuzi, na bofya 'Weka data za mfano'." -INSTL_SITE_LOAD_SAMPLE_DESC8="2. Ufungaji msafi: Ikiwa unataka kufanya ufungaji msafi, weka jina la tovuti na barua pepe ya msimamizi na chagua nenosiri. Kisha endelea kwa hatua ya mwisho kwa kubofya Ifwatayo." +INSTL_SITE_LOAD_SAMPLE_DESC1="Muhimu!: Yenye nguvu imekubaliwa kua watumiaji wapya wa Joomla! wanaweka data za mfano za difoti. Kunfanya hivi, bofya kibonyezo kabla ya kusongea kwa sehemu nyingine." +INSTL_SITE_LOAD_SAMPLE_DESC2="1. Data za mfano: Kabla ya kuacha kusakinisha, unaweza kuweka data ndani ya tovuti. Ni aina mbili za kufanya hivi:" +INSTL_SITE_LOAD_SAMPLE_DESC3="1a. Data za mfano za difoti zaweza kuingizwa. Kufanya hivi, hakikisha kuwa data za mfano za Default English (GB) zinaonyeshwa ndani ya orodha ya kunjuzi na bofya 'Sakinisha data za mfano'." +INSTL_SITE_LOAD_SAMPLE_DESC4="1b. Data za mfano wa desturi zaweza kuwekwa. Kufanya hivi, chagua data za mfano zinazopatikana ndani ya orodha ya kunjuzi, na bofya 'Sakinisha data za mfano'." +INSTL_SITE_LOAD_SAMPLE_DESC8="2. Usakinishaji msafi: Ikiwa unataka kufanya usakinishaji msafi, weka jina la tovuti na barua pepe ya msimamizi na chagua nenosiri. Kisha endelea kwa hatua ya mwisho kwa kubofya Ifwatayo." INSTL_SITE_OFFLINE_LABEL="Tovuti iko offline" -INSTL_SITE_OFFLINE_TITLE_LABEL="Weka upande wa mbele offline baada ya ukimaliza ufungaji. Tovuti itaweza kuwekwa online baadaye kupitia usanidi wa kidunia." +INSTL_SITE_OFFLINE_TITLE_LABEL="Weka upande wa mbele offline baada ya ukimaliza kusakinisha. Tovuti itaweza kuwekwa online baada ya kupitia usanidi wa kidunia." INSTL_SITE_SAMPLE_LABEL="Data za mfano zimewekwa" -INSTL_SITE_INSTALL_SAMPLE_LABEL="Weka data za mfano" -INSTL_SITE_INSTALL_SAMPLE_DESC="Yenye nguvu imekubaliwa kua wanaoanza waweke data za mfano. Hii itawekana mfano wa yaliyomo kutoka kwa paketi ya kuweka ya Joomla!" -INSTL_SITE_SAMPLE_LOADED="Data za mfano zimewekwa vizuri." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Sakinisha data za mfano" +INSTL_SITE_INSTALL_SAMPLE_DESC="Yenye nguvu imekubaliwa kua wanaoanza watasakinisha data za mfano. Hii itawekana mfano wa yaliyomo kutoka kwa paketi ya kusakinisha Joomla!" +INSTL_SITE_SAMPLE_LOADED="Data za mfano zimesakinishwa vizuri." INSTL_SAMPLE_DATA_SET="Data za mfano Default English (GB)" INSTL_SAMPLE_BLOG_SET="Data za mfano Blog English (GB)" INSTL_SAMPLE_BROCHURE_SET="Data za mfano Brochure English (GB)" @@ -108,52 +108,52 @@ INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Maelezo ya Msimamizi kwa kuingia" INSTL_COMPLETE_DESC1="Bofya Tovuti kwa kuonyesha tovuti yako ya Joomla! au bofya kwa msimamizi ndio uweze kwenda kwa msimamizi wako wa kuingia." INSTL_COMPLETE_DESC2="Katika tovuti ya Joomla! Community, utapata orodha ya miunganisho ya mapaketi ya lugha zinazopatikana na miunganisho ya rasilimali zinazohusika na lugha ndani ya famili ya tovuti ya joomla.org." INSTL_COMPLETE_DESC3="Bofya kibonyezo kwa kulia kufungua tovuti ya Joomla! Community katika dirisha jipya." -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Kisanduku cha ufungaji tayari kimefutwa." -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Kisanduku cha ufungaji hakiwezi kufutwa. Tafadhali futa kisanduku cha njia ya mkono." -INSTL_COMPLETE_FOLDER_REMOVED="Kisanduku cha ufungaji kimetolewa vizuri" +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Kisanduku cha kusakinisha tayari kimefutwa." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Kisanduku cha kusakinisha hakiwezi kufutwa. Tafadhali futa kisanduku kwa njia ya mkono." +INSTL_COMPLETE_FOLDER_REMOVED="Kisanduku cha kusakinisha kimetolewa vizuri" INSTL_COMPLETE_LANGUAGE_1="Joomla! kwa lugha yako?" -INSTL_COMPLETE_LANGUAGE_2="Tembelea tovuti ya Joomla! Community kwa kuchukuwa lugha." -INSTL_COMPLETE_REMOVE_FOLDER="Toa kisanduku cha ufungaji" -INSTL_COMPLETE_REMOVE_INSTALLATION="TAFADHALI KUMBUKA KUTOA KABISA
KISADUKU CHA UFUNGAJI.
Hautaweza kuendelea zaidi ya hatua hii mpaka uondoe saraka ya kuweka. Huu ni muhimu wa usalama wa Joomla!" -INSTL_COMPLETE_TITLE="Pongezi! Joomla! imeshawekwa sasa." +INSTL_COMPLETE_LANGUAGE_2="Tembelea tovuti ya Joomla! Community kwa kushusha lugha." +INSTL_COMPLETE_REMOVE_FOLDER="Toa kisanduku cha kusakinisha" +INSTL_COMPLETE_REMOVE_INSTALLATION="TAFADHALI KUMBUKA KUTOA KABISA
KISADUKU CHA KUSAKINISHA.
Hautaweza kuendelea zaidi ya hatua hii mpaka uondoe saraka ya kusakinisha. Huu ni muhimu wa usalama wa Joomla!" +INSTL_COMPLETE_TITLE="Pongezi! Joomla! imeshasakinishwa vizuri." -;Modeli ya hifadhidata +;Modeli wa hifadhidata INSTL_DATABASE_COULD_NOT_CONNECT="Haikuweza kuunganisha kwa hifadhitata. Uungaji umeregesha nambari: %s" INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Haikuweza kunawirisha kashe ya uwazi kwa kiungo: %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Baadhi ya makosa yalitokea wakati wa kufanya backup ya hifadhidata. " -INSTL_DATABASE_ERROR_CREATE="Makosa yalitokea wakati wa kujaribu kutengeneza hifadhidata %s.
Pengine mtumiaji hanahaki ya kutosha ya kutengeneza hifadhidata. Pengine itakubidi utengeneze hifadhidata inayotakiwa kando kabla ya kuweka Joomla!" +INSTL_DATABASE_ERROR_CREATE="Makosa yalitokea wakati wa kujaribu kutengeza hifadhidata %s.
Pengine mtumiaji hanahaki ya kutosha ya kutengeza hifadhidata. Pengine itakubidi utengeze hifadhidata inayotakiwa kando kabla ya kusakinisha Joomla!" INSTL_DATABASE_ERROR_DELETE="Baadhi ya makosa yalitokea wakati wa kufuta hifadhidata." INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Makosa wakati wa kutayarisha nambari ya toleo la muundo" INSTL_DATABASE_FIELD_VALUE_REMOVE="Ondoa" INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" INSTL_DATABASE_FIX_TOO_LONG="Prefix ya jedwali la MySQL lazima iwe si zaidi ya herufi 15." INSTL_DATABASE_INVALID_DB_DETAILS="Maelezo yaliotolewa na hifadhidata hayako sawa na/au ni matupu." -INSTL_DATABASE_INVALID_MYSQL_VERSION="Unataka MySQL 5.0.4 au juu kwa kuendelea kuweka. Toleo lako ni: %s" -INSTL_DATABASE_INVALID_MYSQLI_VERSION="Unataka MySQL 5.0.4 au juu kwa kuendelea kuweka. Toleo lako ni: %s" -INSTL_DATABASE_INVALID_SQLSRV_VERSION="Unataka SQL Sever 2008 R2 (10.50.1600.1) au juu kwa kuendelea kuweka. Toleo lako ni: %s" -INSTL_DATABASE_INVALID_SQLZURE_VERSION="Unataka SQL Sever 2008 R2 (10.50.1600.1) au juu kwa kuendelea kuweka. Toleo lako ni: %s" +INSTL_DATABASE_INVALID_MYSQL_VERSION="Unataka MySQL 5.0.4 au juu kwa kuendelea kusakinisha. Toleo lako ni: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Unataka MySQL 5.0.4 au juu kwa kuendelea kusakinisha. Toleo lako ni: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Unataka SQL Sever 2008 R2 (10.50.1600.1) au juu kwa kuendelea kusakinisha. Toleo lako ni: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Unataka SQL Sever 2008 R2 (10.50.1600.1) au juu kwa kuendelea kusakinisha. Toleo lako ni: %s" INSTL_DATABASE_INVALID_TYPE="Tafadhali chagua aina ya hifadhidata" INSTL_DATABASE_NAME_TOO_LONG="Jina la hifadhidata la MySQL lazima liwe si zaidi ya herufi 64." -INSTL_DATABASE_PREFIX_INVALID_CHARS="Prefix ya jedwali la MySQL lazima ianze kwa herufi na kufuatiwa na maherufi, nambari au kimstari cha chini (_) pekee." +INSTL_DATABASE_PREFIX_INVALID_CHARS="Prefix ya jedwali ya MySQL lazima ianze kwa herufi na kufuatiwa na maherufi, nambari au kimstari cha chini (_) pekee." INSTL_DATABASE_INVALID_NAME="MySQL matoleo ya awali 5.1.6 huenda kuwa yenye alama ya kumaliza (.) au herufi nyingine "_QQ_"maalum"_QQ_" ndani ya jina. Toleo lako ni: %s" INSTL_DATABASE_NAME_INVALID_SPACES="Majina ya hifadhidata ya MySQL na majina ya jedwali silazima kuanza au kuisha na nafasi." INSTL_DATABASE_NAME_INVALID_CHAR="Hakuna utambulisho wa MySQL inaweza kuwa NUL ASCII(0x00)." INSTL_DATABASE_FILE_DOES_NOT_EXIST="Faili %s haiko" ;Watawala -INSTL_COOKIES_NOT_ENABLED="Inaonekana kama kuki haikuwezeshwa katika mteja wako wa kisakuzi. Hautaweza kuweka maombi ikiwa umuhimu huu hautawezeshwa. Matumizi mengine, inawezekana pia kuna matatizo na session.save_path kwa seva. Ikiwa ni hiviyo, tafadhali wasiliana na mtoa wako wa kupeana hosti ikiwa hujuwi kuangalia au kutengeza wewe mwenyewe." +INSTL_COOKIES_NOT_ENABLED="Inaonekana kama kuki haikuwezeshwa katika mteja wako wa kisakuzi. Hautaweza kusakinisha maombi ikiwa umuhimu huu hautawezeshwa. Matumizi mengine, yanawezekana pia kuna matatizo na session.save_path kwa seva. Ikiwa ni hivyo, tafadhali wasiliana na mtoa wako wa kupeana hosti ikiwa hujuwi kuangalia au kutengeza wewe mwenyewe." INSTL_HEADER_ERROR="Makosa" ;Wasaidizi -INSTL_PAGE_TITLE="Joomla! Mwekaji tovuti" +INSTL_PAGE_TITLE="Joomla! Kisakinishi cha mtandao" -;Modeli ya usanidi +;Modeli wa usanidi INSTL_ERROR_CONNECT_DB="Haikuweza kuunganisha kwa hifadhidata. Uungaji umeregesha nambari: %s" -INSTL_STD_OFFLINE_MSG="Tovuti hii imeisha kwa matengenezo.
Tafadhali angalia tena karibuni. " +INSTL_STD_OFFLINE_MSG="Tovuti hii iko chini kwa ajili yamatengezo.
Tafadhali angalia tena karibuni. " -;Modeli ya mfumo wa mafaili -INSTL_FTP_INVALIDROOT="Saraka ya FTP iliyotajwa haiko ndani ya saraka ya ufungaji huu wa Joomla!" +;Modeli wa mfumo wa mafaili +INSTL_FTP_INVALIDROOT="Saraka ya FTP iliyotajwa haiko ndani ya saraka ya usakinishaji huu wa Joomla!" INSTL_FTP_NOCONNECT="Haikuweza kuunganisha kwa seva ya FTP" INSTL_FTP_NODELE="Imekataa kazi ya "_QQ_"DELE"_QQ_"." INSTL_FTP_NODIRECTORYLISTING="Haikuweza kuepua maingizo ndani ya saraka kutoka kwa seva ya FTP." @@ -167,42 +167,42 @@ INSTL_FTP_NORMD="Imekataa kazi ya "_QQ_"RMD"_QQ_"" INSTL_FTP_NOROOT="Haikuweza kuingia kwa saraka ya FTP iliotajwa." INSTL_FTP_NOSTOR="Imekataa kazi ya "_QQ_"STOR"_QQ_"." INSTL_FTP_NOSYST="Imekataa kazi ya "_QQ_"SYST"_QQ_"." -INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Haiwezi kugundua moja kwa moja kisanduku cha enzi ya FTP." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Haiwezi kujigundua kwa kisanduku cha enzi ya FTP." -;Nyingine -INSTL_ADVANCED_SETTINGS="Matayarisho ya kina" +;Wengineo +INSTL_ADVANCED_SETTINGS="Matayarisho ya hali ya juu" INSTL_BASIC_SETTINGS="Matayarisho ya msingi" -INSTL_CONFPROBLEM="Faili au orodha yako ya usanidi haiandikiki au kulikuwa na matatizo katika kutengeneza faili ya usanidi. Itakubidi upakie kodi ifwatayo kwa mkono. Bofya ndani ya eneo la maandishi kuhailaiti kodi zote, na weka ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika kisanduku cha enzi cha tovuti yako." +INSTL_CONFPROBLEM="Faili au orodha yako ya usanidi haiandikiki au kulikuwa na matatizo katika kutengeza faili ya usanidi. Itakubidi upakie kodi ifwatayo kwa mkono. Bofya ndani ya eneo la maandishi kwa kualamisha kodi zote, na sakinisha ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika kisanduku cha enzi cha tovuti yako." INSTL_DATABASE_SUPPORT="Usaidizi wa hifadhidata:" INSTL_DISPLAY_ERRORS="Onyesha makosa" INSTL_ERROR_DB="Baadhi ya makosa yalitokea wakati wa kuweka data ndani ya hifadhidata: %s" INSTL_FILE_UPLOADS="Upakiaji wa mafaili" INSTL_GNU_GPL_LICENSE="GNU General Public License" -INSTL_INSTALLATION="Ufungaji" +INSTL_INSTALLATION="Kusakinisha" INSTL_JSON_SUPPORT_AVAILABLE="Usaidizi wa JSON" INSTL_LICENSE="Leseni" INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="Lugha ya MB ni difoti" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload zima" -INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language haijawekwa kwa katikati. Yaweza kurekebishwa kikawaida kwa kuingiza php_value mbstring.language neutral ndani ya faili yako .htaccess." +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language haijawekwa upande wowote. Yaweza kurekebishwa kikawaida kwa kuingiza php_value mbstring.language neutral ndani ya faili yako .htaccess." INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload imewekwa. Yaweza kuzimwa kikawaida kwa kuingiza php_value mbstring.func_overload 0 ndani ya faili yako .htaccess." -INSTL_NOTICEYOUCANSTILLINSTALL="
Unaweza kuendelea kwa ufungaji kama matayarisho ya usanidi yataonyeshwa mwishoni. Itakubidi upakie kodi ifwatayo kwa mkono. Bofya ndani ya eneo la maandishi kuhailaiti kodi zote, na weka ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika kisanduku cha enzi cha tovuti yako." +INSTL_NOTICEYOUCANSTILLINSTALL="
Unaweza kuendelea na usakinishaji kama matayarisho ya usanidi yataonyeshwa mwishoni. Itakubidi upakie kodi ifwatayo kwa mkono. Bofya ndani ya eneo la maandishi kwa kualamisha kodi zote, na sakinisha ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika kisanduku cha enzi kwa tovuti yako." INSTL_OUTPUT_BUFFERING="Kinga ya pato" INSTL_PARSE_INI_FILE_AVAILABLE="Usaidizi wa parser ya INI" INSTL_PHP_VERSION="Toleo la PHP" -INSTL_REGISTER_GLOBALS="Jiandikishe kidunia" +INSTL_REGISTER_GLOBALS="Jiandikishe kidunia zima" INSTL_SAFE_MODE="Jinsi ya usalama" INSTL_SESSION_AUTO_START="Kuendelea kuanza kikao" -INSTL_WRITABLE="Inayoweza kuandikika" +INSTL_WRITABLE="Inayoandikika" INSTL_XML_SUPPORT="Usaidizi wa XML" -INSTL_ZIP_SUPPORT_AVAILABLE="Usaidizi uliotokea wa ZIP" +INSTL_ZIP_SUPPORT_AVAILABLE="Usaidizi uliotokea kwa ZIP" INSTL_ZLIB_COMPRESSION_SUPPORT="Usaidizi wa ugandizaji wa Zlib" INSTL_PROCESS_BUSY="Maandao yanaendelea. Tafadhali ngonjea..." ;Masharti ya kidunia JADMINISTRATOR="Msimamizi" -JADVANCED="Kina" +JADVANCED="Hali ya juu" JCHECK_AGAIN="Angalia tena" JERROR="Makosa" JGLOBAL_ISFREESOFTWARE="%s ni programu huru iliyotolewa chini ya GNU General Public License." @@ -211,14 +211,14 @@ JNEXT="Ifuatayo" JNO="Hapana" JOFF="Zima" JON="Washa" -JPREVIOUS="Iliyopita" +JPREVIOUS="Yaliyotangulia" JSITE="Tovuti" JUSERNAME="Jina la mtumiaji" JYES="Ndiyo" ; Masharti ya muundo muhimu, ikiwa paketi ya lugha haipatikani JLIB_DATABASE_ERROR_CONNECT_MYSQL="Haiwezi kuunganisha kwa MYSQL" -JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Haiwezi kuweka madereva ya hifadhidata: %s" +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Haiwezi kupakia madereva kwa hifadhidata: %s" JLIB_ENVIRONMENT_SESSION_EXPIRED="Wakati wa kikao chako umekwisha, tafadhali pakia tena ukurasa." JLIB_FORM_VALIDATE_FIELD_REQUIRED="Eneo linalohitajika %s" JLIB_FORM_VALIDATE_FIELD_INVALID="Eneo lisilofaa: %s" From 2e0208a373ed03fb89825f1ea61cd0ac1b2221aa Mon Sep 17 00:00:00 2001 From: Parth Lawate Date: Wed, 20 Mar 2013 17:46:46 +0100 Subject: [PATCH 13/19] # [#29982] Cant add fields to the category form using a plugin. Thanks Parth --- .../views/category/tmpl/edit.php | 22 +++++++++++++++++-- .../html/com_categories/category/edit.php | 18 +++++++++++++++ installation/CHANGELOG | 3 +++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php index 15791c25a7f18..119b4b3ad7de4 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit.php +++ b/administrator/components/com_categories/views/category/tmpl/edit.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * @subpackage com_categories - * @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -86,7 +86,25 @@ loadTemplate('metadata'); ?>
- + form->getFieldsets('attribs'); ?> + $fieldSet) : ?> + label) ? $fieldSet->label : 'COM_CATEGORIES_'.$name.'_FIELDSET_LABEL'; ?> + + + description) && trim($fieldSet->description)) : ?> +

escape(JText::_($fieldSet->description));?>

+ +
+
    + form->getFieldset($name) as $field) : ?> +
  • label; ?> + input; ?>
    • + +
+
+ + +
diff --git a/administrator/templates/hathor/html/com_categories/category/edit.php b/administrator/templates/hathor/html/com_categories/category/edit.php index d48cf264ddea6..cd4e924c5fa5e 100644 --- a/administrator/templates/hathor/html/com_categories/category/edit.php +++ b/administrator/templates/hathor/html/com_categories/category/edit.php @@ -90,6 +90,24 @@ loadTemplate('metadata'); ?> + form->getFieldsets('attribs'); ?> + $fieldSet) : ?> + label) ? $fieldSet->label : 'COM_CATEGORIES_'.$name.'_FIELDSET_LABEL'; ?> + + + description) && trim($fieldSet->description)) : ?> +

escape(JText::_($fieldSet->description));?>

+ +
+
    + form->getFieldset($name) as $field) : ?> +
  • label; ?> + input; ?>
    • + +
+
+ +
diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 5892e94fd67fc..c9cba99499f3a 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +20-Mar-2013 Jean-Marie Simonet + # [#29982] Cant add fields to the category form using a plugin. Thanks Parth + 18-Mar-2013 Jean-Marie Simonet # [#26860] A Contact name *must not* be unique. Thanks Christophe $ Updating Swahili intallation ini file From 8dbf47f2736c7297e9d660a2f7889b4eea06a1e9 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Wed, 20 Mar 2013 18:21:57 +0100 Subject: [PATCH 14/19] en-GB version update --- administrator/language/en-GB/en-GB.xml | 2 +- language/en-GB/en-GB.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index bd718ce02550f..f056a402b4257 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 2.5.5 + 2.5.10 2008-03-15 Joomla! Project admin@joomla.org diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index ac42618996374..10daa1a290592 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 2.5.5 + 2.5.10 2008-03-15 Joomla! Project admin@joomla.org From 0035c42d688c1d656f24d17a3819c16916420eec Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Thu, 21 Mar 2013 16:54:12 +0100 Subject: [PATCH 15/19] # [#30346] *Contact creator does not include default language "All" for the contact created --- installation/CHANGELOG | 3 +++ plugins/user/contactcreator/contactcreator.php | 1 + 2 files changed, 4 insertions(+) diff --git a/installation/CHANGELOG b/installation/CHANGELOG index c9cba99499f3a..a29ca5d682b43 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +21-Mar-2013 Jean-Marie Simonet +# [#30346] *Contact creator does not include default language "All" for the contact created + 20-Mar-2013 Jean-Marie Simonet # [#29982] Cant add fields to the category form using a plugin. Thanks Parth diff --git a/plugins/user/contactcreator/contactcreator.php b/plugins/user/contactcreator/contactcreator.php index b09c3f6c87ad1..ea9d6b9ccba00 100644 --- a/plugins/user/contactcreator/contactcreator.php +++ b/plugins/user/contactcreator/contactcreator.php @@ -79,6 +79,7 @@ function onUserAfterSave($user, $isnew, $success, $msg) $contact->user_id = $user_id; $contact->email_to = $user['email']; $contact->catid = $category; + $contact->language = '*'; $autowebpage = $this->params->get('autowebpage', ''); From 1471cb50c6069db44e6663a94c88cede68768542 Mon Sep 17 00:00:00 2001 From: Valentin Despa Date: Sun, 24 Mar 2013 13:31:10 -0500 Subject: [PATCH 16/19] [#28978] Smart search (com_finder) - problem when using 'Allow Empty Search' --- components/com_finder/models/search.php | 6 +++++- installation/CHANGELOG | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/components/com_finder/models/search.php b/components/com_finder/models/search.php index 890601c09b4a6..e2824b97ff783 100644 --- a/components/com_finder/models/search.php +++ b/components/com_finder/models/search.php @@ -14,6 +14,7 @@ JLoader::register('FinderIndexerHelper', FINDER_PATH_INDEXER . '/helper.php'); JLoader::register('FinderIndexerQuery', FINDER_PATH_INDEXER . '/query.php'); JLoader::register('FinderIndexerResult', FINDER_PATH_INDEXER . '/result.php'); +JLoader::register('FinderIndexerStemmer', FINDER_PATH_INDEXER . '/stemmer.php'); jimport('joomla.application.component.modellist'); @@ -1200,10 +1201,13 @@ protected function populateState($ordering = null, $direction = null) $this->setState('list.ordering', 'l.list_price'); break; - default: case ($order == 'relevance' && !empty($this->includedTerms)): $this->setState('list.ordering', 'm.weight'); break; + + default: + $this->setState('list.ordering', 'l.link_id'); + break; } // Load the sort direction. diff --git a/installation/CHANGELOG b/installation/CHANGELOG index a29ca5d682b43..8764382395db6 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +24-Mar-2013 Michael Babker + # [#28978] Smart search (com_finder) - problem when using "Allow Empty Search". Thanks Valentin + 21-Mar-2013 Jean-Marie Simonet # [#30346] *Contact creator does not include default language "All" for the contact created From a24f6ca6573f3fd110fafc9412051f0efc555611 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Thu, 28 Mar 2013 12:13:45 +0100 Subject: [PATCH 17/19] # *Multilanguage 2.5: SIngle article display does not filter correctly author contact per language. --- components/com_content/models/article.php | 13 +++++++++++-- installation/CHANGELOG | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php index 081b9364f1a3a..205a3da06bbf6 100644 --- a/components/com_content/models/article.php +++ b/components/com_content/models/article.php @@ -55,6 +55,8 @@ protected function populateState() $this->setState('filter.published', 1); $this->setState('filter.archived', 2); } + + $this->setState('filter.language', JLanguageMultilang::isEnabled()); } /** @@ -101,7 +103,7 @@ public function &getItem($pk = null) // Join on user table. $query->select('u.name AS author'); $query->join('LEFT', '#__users AS u on u.id = a.created_by'); - + // Join on contact table $subQuery = $db->getQuery(true); $subQuery->select('contact.user_id, MAX(contact.id) AS id, contact.language'); @@ -110,7 +112,14 @@ public function &getItem($pk = null) $subQuery->group('contact.user_id, contact.language'); $query->select('contact.id as contactid' ); $query->join('LEFT', '(' . $subQuery . ') AS contact ON contact.user_id = a.created_by'); - + + // Filter by language + if ($this->getState('filter.language')) + { + $query->where('a.language in ('.$db->quote(JFactory::getLanguage()->getTag()).','.$db->quote('*').')'); + $query->where('(contact.language in ('.$db->quote(JFactory::getLanguage()->getTag()).','.$db->quote('*').') OR contact.language IS NULL)'); + } + // Join over the categories to get parent category titles $query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias'); $query->join('LEFT', '#__categories as parent ON parent.id = c.parent_id'); diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 8764382395db6..960f21465964e 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,9 @@ $ -> Language fix or change - -> Removed ! -> Note +28-Mar-2013 Jean-Marie Simonet + # *Multilanguage 2.5: SIngle article display does not filter correctly author contact per language. + 24-Mar-2013 Michael Babker # [#28978] Smart search (com_finder) - problem when using "Allow Empty Search". Thanks Valentin From 986bb28ca4ce437f359858a6b766b5ac62a57c62 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Fri, 29 Mar 2013 11:51:17 +0100 Subject: [PATCH 18/19] adding missing index.html --- media/com_joomlaupdate/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 media/com_joomlaupdate/index.html diff --git a/media/com_joomlaupdate/index.html b/media/com_joomlaupdate/index.html new file mode 100644 index 0000000000000..2efb97f319a35 --- /dev/null +++ b/media/com_joomlaupdate/index.html @@ -0,0 +1 @@ + From 316710e6ab40ac39e6f57e68a6f724f5693d1243 Mon Sep 17 00:00:00 2001 From: Mark Dexter Date: Fri, 29 Mar 2013 16:37:12 -0700 Subject: [PATCH 19/19] [#29417] sendMail automatically adds sender as replyTo. Thanks Roberto. --- installation/CHANGELOG | 1 + libraries/joomla/mail/mail.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 960f21465964e..cd0992bcf96ce 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -28,6 +28,7 @@ $ -> Language fix or change 28-Mar-2013 Jean-Marie Simonet # *Multilanguage 2.5: SIngle article display does not filter correctly author contact per language. + # [#29417] sendMail automatically adds sender as replyTo. Thanks Roberto. 24-Mar-2013 Michael Babker # [#28978] Smart search (com_finder) - problem when using "Allow Empty Search". Thanks Valentin diff --git a/libraries/joomla/mail/mail.php b/libraries/joomla/mail/mail.php index 20e3862452e57..9a63857a63db2 100644 --- a/libraries/joomla/mail/mail.php +++ b/libraries/joomla/mail/mail.php @@ -417,7 +417,6 @@ public function useSMTP($auth = null, $host = null, $user = null, $pass = null, public function sendMail($from, $fromName, $recipient, $subject, $body, $mode = false, $cc = null, $bcc = null, $attachment = null, $replyTo = null, $replyToName = null) { - $this->setSender(array($from, $fromName)); $this->setSubject($subject); $this->setBody($body); @@ -447,6 +446,10 @@ public function sendMail($from, $fromName, $recipient, $subject, $body, $mode = $this->addReplyTo(array($replyTo, $replyToName)); } + // Add sender to replyTo only if no replyTo received + $autoReplyTo = (empty($this->ReplyTo)) ? true : false; + $this->setSender(array($from, $fromName, $autoReplyTo)); + return $this->Send(); }