24 administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
View file
@@ -11,15 +11,15 @@
defined('_JEXEC') or die;
?>
<fieldset class="adminform">
<legend><?php echo JText::_('COM_ADMIN_SYSTEM_INFORMATION'); ?></legend>
<legend><?php echo MolajoText::_('COM_ADMIN_SYSTEM_INFORMATION'); ?></legend>
<table class="adminlist">
<thead>
<tr>
<th width="250">
<?php echo JText::_('COM_ADMIN_SETTING'); ?>
<?php echo MolajoText::_('COM_ADMIN_SETTING'); ?>
</th>
<th>
<?php echo JText::_('COM_ADMIN_VALUE'); ?>
<?php echo MolajoText::_('COM_ADMIN_VALUE'); ?>
</th>
</tr>
</thead>
@@ -32,70 +32,70 @@
<tbody>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_PHP_BUILT_ON'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_PHP_BUILT_ON'); ?></strong>
</td>
<td>
<?php echo $this->info['php'];?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_DATABASE_VERSION'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_DATABASE_VERSION'); ?></strong>
</td>
<td>
<?php echo $this->info['dbversion'];?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_DATABASE_COLLATION'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_DATABASE_COLLATION'); ?></strong>
</td>
<td>
<?php echo $this->info['dbcollation'];?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_PHP_VERSION'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_PHP_VERSION'); ?></strong>
</td>
<td>
<?php echo $this->info['phpversion'];?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_WEB_SERVER'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_WEB_SERVER'); ?></strong>
</td>
<td>
<?php echo JHtml::_('system.server',$this->info['server']); ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?></strong>
</td>
<td>
<?php echo $this->info['sapi_name'];?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_JOOMLA_VERSION'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_JOOMLA_VERSION'); ?></strong>
</td>
<td>
<?php echo $this->info['version'];?>
</td>
</tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_PLATFORM_VERSION'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_PLATFORM_VERSION'); ?></strong>
</td>
<td>
<?php echo $this->info['platform'];?>
</td>
</tr>
<tr>
<td>
<strong><?php echo JText::_('COM_ADMIN_USER_AGENT'); ?></strong>
<strong><?php echo MolajoText::_('COM_ADMIN_USER_AGENT'); ?></strong>
</td>
<td>
<?php echo $this->info['useragent'];?>
4 administrator/components/com_admin/views/sysinfo/view.html.php
View file
@@ -47,7 +47,7 @@ function display($tpl = null)
{
// Access check.
if (!MolajoFactory::getUser()->authorise('core.admin')) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

// Initialise variables.
@@ -81,7 +81,7 @@ protected function _setSubMenu()
*/
protected function addToolbar()
{
MolajoToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'systeminfo.png');
MolajoToolbarHelper::title(MolajoText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'systeminfo.png');
MolajoToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
}
}
4 administrator/components/com_articles/helpers/articles.php
View file
@@ -32,12 +32,12 @@ class ArticlesHelper
public static function addSubmenu($vName)
{
MolajoSubMenuHelper::addEntry(
JText::_('COM_ARTICLES_ARTICLES'),
MolajoText::_('COM_ARTICLES_ARTICLES'),
'index.php?option=com_articles&view=articles',
$vName == 'articles'
);
MolajoSubMenuHelper::addEntry(
JText::_('COM_ARTICLES_SUBMENU_CATEGORIES'),
MolajoText::_('COM_ARTICLES_SUBMENU_CATEGORIES'),
'index.php?option=com_categories&extension=com_articles',
$vName == 'categories'
);
2 administrator/components/com_cache/cache.php
View file
@@ -12,7 +12,7 @@

// Access check.
if (!MolajoFactory::getUser()->authorise('core.manage', 'com_cache')) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

// Include dependancies
10 administrator/components/com_cache/controller.php
View file
@@ -69,14 +69,14 @@ public function display($cachable = false, $urlparams = false)
public function delete()
{
// Check for request forgeries
JRequest::checkToken() or jexit(JText::_('JInvalid_Token'));
JRequest::checkToken() or jexit(MolajoText::_('JInvalid_Token'));

$cid = JRequest::getVar('cid', array(), 'post', 'array');

$model = $this->getModel('cache');

if(empty($cid)) {
JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED'));
JError::raiseWarning(500, MolajoText::_('JERROR_NO_ITEMS_SELECTED'));
} else {
$model->cleanlist($cid);
}
@@ -87,16 +87,16 @@ public function delete()
public function purge()
{
// Check for request forgeries
JRequest::checkToken() or jexit(JText::_('JInvalid_Token'));
JRequest::checkToken() or jexit(MolajoText::_('JInvalid_Token'));

$model = $this->getModel('cache');
$ret = $model->purge();

$msg = JText::_('COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED');
$msg = MolajoText::_('COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED');
$msgType = 'message';

if ($ret === false) {
$msg = JText::_('Error purging expired items');
$msg = MolajoText::_('Error purging expired items');
$msgType = 'error';
}

10 administrator/components/com_cache/helpers/cache.php
View file
@@ -27,8 +27,8 @@ static function getApplicationOptions()
{
// Build the filter options.
$options = array();
$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
$options[] = JHtml::_('select.option', '0', MolajoText::_('JSITE'));
$options[] = JHtml::_('select.option', '1', MolajoText::_('JADMINISTRATOR'));
return $options;
}

@@ -43,18 +43,18 @@ static function getApplicationOptions()
public static function addSubmenu($vName)
{
JSubMenuHelper::addEntry(
JText::_('JGLOBAL_SUBMENU_CHECKIN'),
MolajoText::_('JGLOBAL_SUBMENU_CHECKIN'),
'index.php?option=com_checkin',
$vName == 'com_checkin'
);

JSubMenuHelper::addEntry(
JText::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
MolajoText::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
'index.php?option=com_cache',
$vName == 'cache'
);
JSubMenuHelper::addEntry(
JText::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
MolajoText::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
'index.php?option=com_cache&view=purge',
$vName == 'purge'
);
4 administrator/components/com_cache/views/cache/tmpl/default.php
View file
@@ -27,10 +27,10 @@
<thead>
<tr>
<th class="title" width="10">
<?php echo JText::_('COM_CACHE_NUM'); ?>
<?php echo MolajoText::_('COM_CACHE_NUM'); ?>
</th>
<th width="20">
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo MolajoText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
</th>
<th class="title nowrap">
<?php echo JHtml::_('grid.sort', 'COM_CACHE_GROUP', 'group', $listDirn, $listOrder); ?>
2 administrator/components/com_cache/views/cache/view.html.php
View file
@@ -54,7 +54,7 @@ protected function addToolbar()
$user = MolajoFactory::getUser();
$condition = ($this->application->name == 'site');

MolajoToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE'), 'clear.png');
MolajoToolbarHelper::title(MolajoText::_('COM_CACHE_CLEAR_CACHE'), 'clear.png');
MolajoToolbarHelper::custom('delete', 'delete.png', 'delete_f2.png', 'JTOOLBAR_DELETE', true);
MolajoToolbarHelper::divider();
if (MolajoFactory::getUser()->authorise('core.admin', 'com_cache')) {
6 administrator/components/com_cache/views/purge/tmpl/default.php
View file
@@ -16,15 +16,15 @@
<thead>
<tr>
<th>
<?php echo JText::_('COM_CACHE_PURGE_EXPIRED_ITEMS'); ?>
<?php echo MolajoText::_('COM_CACHE_PURGE_EXPIRED_ITEMS'); ?>
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<p class="mod-purge-instruct"><?php echo JText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
<p class="warning"><?php echo JText::_('COM_CACHE_RESOURCE_INTENSIVE_WARNING'); ?></p>
<p class="mod-purge-instruct"><?php echo MolajoText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
<p class="warning"><?php echo MolajoText::_('COM_CACHE_RESOURCE_INTENSIVE_WARNING'); ?></p>
</td>
</tr>
</tbody>
4 administrator/components/com_cache/views/purge/view.html.php
View file
@@ -35,9 +35,9 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
//JSubMenuHelper::addEntry(JText::_('COM_CACHE_BACK_CACHE_MANAGER'), 'index.php?option=com_cache', false);
//JSubMenuHelper::addEntry(MolajoText::_('COM_CACHE_BACK_CACHE_MANAGER'), 'index.php?option=com_cache', false);

MolajoToolbarHelper::title(JText::_('COM_CACHE_PURGE_EXPIRED_CACHE'), 'purge.png');
MolajoToolbarHelper::title(MolajoText::_('COM_CACHE_PURGE_EXPIRED_CACHE'), 'purge.png');
MolajoToolbarHelper::custom('purge', 'delete.png', 'delete_f2.png', 'COM_CACHE_PURGE_EXPIRED', false);
MolajoToolbarHelper::divider();
if (MolajoFactory::getUser()->authorise('core.admin', 'com_cache')) {
2 administrator/components/com_categories/categories.php
View file
@@ -12,7 +12,7 @@

// Access check.
if (!MolajoFactory::getUser()->authorise('core.manage', JRequest::getCmd('extension'))) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

// Include dependancies
4 administrator/components/com_categories/controller.php
View file
@@ -36,7 +36,7 @@ public function __construct($config = array())
{
parent::__construct($config);

// Guess the JText message prefix. Defaults to the option.
// Guess the MolajoText message prefix. Defaults to the option.
if (empty($this->extension)) {
$this->extension = JRequest::getCmd('extension', 'com_articles');
}
@@ -65,7 +65,7 @@ public function display($cachable = false, $urlparams = false)
// Check for edit form.
if ($vName == 'category' && $lName == 'edit' && !$this->checkEditId('com_categories.edit.category', $id)) {
// Somehow the person just went to the form - we don't allow that.
$this->setError(JText::sprintf('MOLAJO_APPLICATION_ERROR_UNHELD_ID', $id));
$this->setError(MolajoText::sprintf('MOLAJO_APPLICATION_ERROR_UNHELD_ID', $id));
$this->setMessage($this->getError(), 'error');
$this->setRedirect(MolajoRoute::_('index.php?option=com_categories&view=categories&extension='.$this->extension, false));

4 administrator/components/com_categories/controllers/categories.php
View file
@@ -51,11 +51,11 @@ public function rebuild()

if ($model->rebuild()) {
// Rebuild succeeded.
$this->setMessage(JText::_('COM_CATEGORIES_REBUILD_SUCCESS'));
$this->setMessage(MolajoText::_('COM_CATEGORIES_REBUILD_SUCCESS'));
return true;
} else {
// Rebuild failed.
$this->setMessage(JText::_('COM_CATEGORIES_REBUILD_FAILURE'));
$this->setMessage(MolajoText::_('COM_CATEGORIES_REBUILD_FAILURE'));
return false;
}
}
2 administrator/components/com_categories/controllers/category.php
View file
@@ -35,7 +35,7 @@ public function __construct($config = array())
{
parent::__construct($config);

// Guess the JText message prefix. Defaults to the option.
// Guess the MolajoText message prefix. Defaults to the option.
if (empty($this->extension)) {
$this->extension = JRequest::getCmd('extension', 'com_articles');
}
20 administrator/components/com_categories/models/category.php
View file
@@ -279,7 +279,7 @@ protected function preprocessForm(JForm $form, $data, $groups = '')
$lang->load($component, JPATH_BASE, $lang->getDefault(), false, false);

if (!$form->loadFile($path, false)) {
throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
throw new Exception(MolajoText::_('JERROR_LOADFILE_FAILED'));
}
}

@@ -468,7 +468,7 @@ protected function batchAccess($value, $pks)
foreach ($pks as $pk) {
if (!$user->authorise('core.edit', $extension.'.category.'.$pk)) {
// Error since user cannot edit this category
$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_EDIT'));
$this->setError(MolajoText::_('COM_CATEGORIES_BATCH_CANNOT_EDIT'));
return false;
}
}
@@ -516,7 +516,7 @@ protected function batchCopy($value, $pks)
}
else {
// Non-fatal error
$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
$this->setError(MolajoText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
$parentId = 0;
}
}
@@ -525,7 +525,7 @@ protected function batchCopy($value, $pks)
$user->authorise('core.create', $extension.'.category.'.$parentId);
if (!$canCreate) {
// Error since user cannot create in parent category
$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
$this->setError(MolajoText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
return false;
}
}
@@ -538,7 +538,7 @@ protected function batchCopy($value, $pks)
}
// Make sure we can create in root
elseif (!$user->authorise('core.create', $extension)) {
$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
$this->setError(MolajoText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
return false;
}
}
@@ -575,7 +575,7 @@ protected function batchCopy($value, $pks)
}
else {
// Not fatal error
$this->setError(JText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
$this->setError(MolajoText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
continue;
}
}
@@ -677,7 +677,7 @@ protected function batchMove($value, $pks)
}
else {
// Non-fatal error
$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
$this->setError(MolajoText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
$parentId = 0;
}
}
@@ -686,7 +686,7 @@ protected function batchMove($value, $pks)
$user->authorise('core.create', $extension.'.category.'.$parentId);
if (!$canCreate) {
// Error since user cannot create in parent category
$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
$this->setError(MolajoText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
return false;
}

@@ -695,7 +695,7 @@ protected function batchMove($value, $pks)
foreach ($pks as $pk) {
if (!$user->authorise('core.edit', $extension.'.category.'.$pk)) {
// Error since user cannot edit this category
$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_EDIT'));
$this->setError(MolajoText::_('COM_CATEGORIES_BATCH_CANNOT_EDIT'));
return false;
}
}
@@ -717,7 +717,7 @@ protected function batchMove($value, $pks)
}
else {
// Not fatal error
$this->setError(JText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
$this->setError(MolajoText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
continue;
}
}
4 administrator/components/com_categories/models/fields/categoryparent.php
View file
@@ -84,7 +84,7 @@ protected function getOptions()
{
// Translate ROOT
if ($options[$i]->level == 0) {
$options[$i]->text = JText::_('JGLOBAL_ROOT_PARENT');
$options[$i]->text = MolajoText::_('JGLOBAL_ROOT_PARENT');
}

$options[$i]->text = str_repeat('- ',$options[$i]->level).$options[$i]->text;
@@ -127,7 +127,7 @@ protected function getOptions()
if (isset($row) && !isset($options[0])) {
if ($row->parent_id == '1') {
$parent = new stdClass();
$parent->text = JText::_('JGLOBAL_ROOT_PARENT');
$parent->text = MolajoText::_('JGLOBAL_ROOT_PARENT');
array_unshift($options, $parent);
}
}
26 administrator/components/com_categories/views/categories/tmpl/default.php
View file
@@ -27,30 +27,30 @@

<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CATEGORIES_ITEMS_SEARCH_FILTER'); ?>" />
<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
<label class="filter-search-lbl" for="filter_search"><?php echo MolajoText::_('JSEARCH_FILTER_LABEL'); ?></label>
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo MolajoText::_('COM_CATEGORIES_ITEMS_SEARCH_FILTER'); ?>" />
<button type="submit"><?php echo MolajoText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo MolajoText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>

<div class="filter-select fltrt">
<select name="filter_level" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('COM_CATEGORIES_OPTION_SELECT_LEVEL');?></option>
<option value=""><?php echo MolajoText::_('COM_CATEGORIES_OPTION_SELECT_LEVEL');?></option>
<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level'));?>
</select>

<select name="filter_published" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
<option value=""><?php echo MolajoText::_('JOPTION_SELECT_PUBLISHED');?></option>
<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
</select>

<select name="filter_access" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
<option value=""><?php echo MolajoText::_('JOPTION_SELECT_ACCESS');?></option>
<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
</select>

<select name="filter_language" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
<option value=""><?php echo MolajoText::_('JOPTION_SELECT_LANGUAGE');?></option>
<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
</select>
</div>
@@ -61,7 +61,7 @@
<thead>
<tr>
<th width="1%">
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo MolajoText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
</th>
<th>
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
@@ -121,9 +121,9 @@
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
<?php echo str_repeat('<span class="gtr">|&mdash;</span>', $item->level-1) ?>
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php echo MolajoText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php else : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note));?>
<?php echo MolajoText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note));?>
<?php endif; ?></p>
</td>
<td class="center">
@@ -147,9 +147,9 @@
</td>
<td class="center nowrap">
<?php if ($item->language=='*'):?>
<?php echo JText::alt('JALL','language'); ?>
<?php echo MolajoText::alt('JALL','language'); ?>
<?php else:?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
<?php echo $item->language_title ? $this->escape($item->language_title) : MolajoText::_('JUNDEFINED'); ?>
<?php endif;?>
</td>
<td class="center">
14 administrator/components/com_categories/views/categories/tmpl/default_batch.php
View file
@@ -11,31 +11,31 @@
defined('_JEXEC') or die;

$options = array(
JHtml::_('select.option', 'c', JText::_('MOLAJO_HTML_BATCH_COPY')),
JHtml::_('select.option', 'm', JText::_('MOLAJO_HTML_BATCH_MOVE'))
JHtml::_('select.option', 'c', MolajoText::_('MOLAJO_HTML_BATCH_COPY')),
JHtml::_('select.option', 'm', MolajoText::_('MOLAJO_HTML_BATCH_MOVE'))
);
$published = $this->state->get('filter.published');
$extension = $this->escape($this->state->get('filter.extension'));
?>
<fieldset class="batch">
<legend><?php echo JText::_('COM_CATEGORIES_BATCH_OPTIONS');?></legend>
<legend><?php echo MolajoText::_('COM_CATEGORIES_BATCH_OPTIONS');?></legend>
<?php echo JHtml::_('batch.access');?>

<?php if ($published >= 0) : ?>
<label id="batch-choose-action-lbl" for="batch-category-id">
<?php echo JText::_('COM_CATEGORIES_BATCH_CATEGORY_LABEL'); ?>
<?php echo MolajoText::_('COM_CATEGORIES_BATCH_CATEGORY_LABEL'); ?>
</label>
<select name="batch[category_id]" class="inputbox" id="batch-category-id">
<option value=""><?php echo JText::_('JSELECT') ?></option>
<option value=""><?php echo MolajoText::_('JSELECT') ?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('published' => $published)));?>
</select>
<?php echo JHtml::_( 'select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
<?php endif; ?>

<button type="submit" onclick="submitbutton('category.batch');">
<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
<?php echo MolajoText::_('JGLOBAL_BATCH_PROCESS'); ?>
</button>
<button type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value=''">
<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
<?php echo MolajoText::_('JSEARCH_FILTER_CLEAR'); ?>
</button>
</fieldset>
28 administrator/components/com_categories/views/categories/view.html.php
View file
@@ -45,16 +45,16 @@ public function display($tpl = null)

// Levels filter.
$options = array();
$options[] = JHtml::_('select.option', '1', JText::_('J1'));
$options[] = JHtml::_('select.option', '2', JText::_('J2'));
$options[] = JHtml::_('select.option', '3', JText::_('J3'));
$options[] = JHtml::_('select.option', '4', JText::_('J4'));
$options[] = JHtml::_('select.option', '5', JText::_('J5'));
$options[] = JHtml::_('select.option', '6', JText::_('J6'));
$options[] = JHtml::_('select.option', '7', JText::_('J7'));
$options[] = JHtml::_('select.option', '8', JText::_('J8'));
$options[] = JHtml::_('select.option', '9', JText::_('J9'));
$options[] = JHtml::_('select.option', '10', JText::_('J10'));
$options[] = JHtml::_('select.option', '1', MolajoText::_('J1'));
$options[] = JHtml::_('select.option', '2', MolajoText::_('J2'));
$options[] = JHtml::_('select.option', '3', MolajoText::_('J3'));
$options[] = JHtml::_('select.option', '4', MolajoText::_('J4'));
$options[] = JHtml::_('select.option', '5', MolajoText::_('J5'));
$options[] = JHtml::_('select.option', '6', MolajoText::_('J6'));
$options[] = JHtml::_('select.option', '7', MolajoText::_('J7'));
$options[] = JHtml::_('select.option', '8', MolajoText::_('J8'));
$options[] = JHtml::_('select.option', '9', MolajoText::_('J9'));
$options[] = JHtml::_('select.option', '10', MolajoText::_('J10'));

$this->assign('f_levels', $options);

@@ -95,15 +95,15 @@ protected function addToolbar()

// If a component categories title string is present, let's use it.
if ($lang->hasKey($component_title_key = strtoupper($component.($section?"_$section":'')).'_CATEGORIES_TITLE')) {
$title = JText::_($component_title_key);
$title = MolajoText::_($component_title_key);
}
// Else if the component section string exits, let's use it
elseif ($lang->hasKey($component_section_key = strtoupper($component.($section?"_$section":'')))) {
$title = JText::sprintf( 'COM_CATEGORIES_CATEGORIES_TITLE', $this->escape(JText::_($component_section_key)));
$title = MolajoText::sprintf( 'COM_CATEGORIES_CATEGORIES_TITLE', $this->escape(MolajoText::_($component_section_key)));
}
// Else use the base title
else {
$title = JText::_('COM_CATEGORIES_CATEGORIES_BASE_TITLE');
$title = MolajoText::_('COM_CATEGORIES_CATEGORIES_BASE_TITLE');
}

// Load specific css component
@@ -157,7 +157,7 @@ protected function addToolbar()
// -remotely searching in a component URL if helpURL param exists in the component and is NOT set to ''
if ($lang->hasKey($lang_help_url = strtoupper($component).'_HELP_URL')) {
$debug = $lang->setDebug(false);
$url = JText::_($lang_help_url);
$url = MolajoText::_($lang_help_url);
$lang->setDebug($debug);
}
else {
12 administrator/components/com_categories/views/category/tmpl/edit.php
View file
@@ -26,15 +26,15 @@
<?php echo $this->form->getField('description')->save(); ?>
Joomla.submitform(task, document.getElementById('item-form'));
} else {
alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
alert('<?php echo $this->escape(MolajoText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
}
}
</script>

<form action="<?php echo MolajoRoute::_('index.php?option=com_categories&extension='.JRequest::getCmd('extension', 'com_articles').'&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CATEGORIES_FIELDSET_DETAILS');?></legend>
<legend><?php echo MolajoText::_('COM_CATEGORIES_FIELDSET_DETAILS');?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?></li>
@@ -55,10 +55,10 @@
<?php echo $this->form->getInput('access'); ?></li>

<?php if ($this->canDo->get('core.admin')): ?>
<li><span class="faux-label"><?php echo JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></span>
<li><span class="faux-label"><?php echo MolajoText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></span>
<div class="button2-left"><div class="blank">
<button type="button" onclick="document.location.href='#access-rules';">
<?php echo JText::_('JGLOBAL_PERMISSIONS_ANCHOR'); ?></button>
<?php echo MolajoText::_('JGLOBAL_PERMISSIONS_ANCHOR'); ?></button>
</div></div>
</li>
<?php endif; ?>
@@ -82,7 +82,7 @@
<?php echo $this->loadTemplate('options'); ?>
<div class="clr"></div>

<?php echo JHtml::_('sliders.panel',JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
<?php echo JHtml::_('sliders.panel',MolajoText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
<fieldset class="panelform">
<?php echo $this->loadTemplate('metadata'); ?>
</fieldset>
@@ -96,7 +96,7 @@

<?php echo JHtml::_('sliders.start','permissions-sliders-'.$this->item->id, array('useCookie'=>1)); ?>

<?php echo JHtml::_('sliders.panel',JText::_('COM_CATEGORIES_FIELDSET_RULES'), 'access-rules'); ?>
<?php echo JHtml::_('sliders.panel',MolajoText::_('COM_CATEGORIES_FIELDSET_RULES'), 'access-rules'); ?>
<fieldset class="panelform">
<?php echo $this->form->getLabel('rules'); ?>
<?php echo $this->form->getInput('rules'); ?>
6 administrator/components/com_categories/views/category/tmpl/edit_options.php
View file
@@ -10,7 +10,7 @@
// No direct access.
defined('_JEXEC') or die; ?>

<?php echo JHtml::_('sliders.panel',JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
<?php echo JHtml::_('sliders.panel',MolajoText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>

<fieldset class="panelform">
<ul class="adminformlist">
@@ -38,9 +38,9 @@

foreach ($fieldSets as $name => $fieldSet) :
$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_'.$name.'_FIELDSET_LABEL';
echo JHtml::_('sliders.panel',JText::_($label), $name.'-options');
echo JHtml::_('sliders.panel',MolajoText::_($label), $name.'-options');
if (isset($fieldSet->description) && trim($fieldSet->description)) :
echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
echo '<p class="tip">'.$this->escape(MolajoText::_($fieldSet->description)).'</p>';
endif;
?>
<fieldset class="panelform">
8 administrator/components/com_categories/views/category/view.html.php
View file
@@ -84,15 +84,15 @@ protected function addToolbar()

// If a component categories title string is present, let's use it.
if ($lang->hasKey($component_title_key = $component.($section?"_$section":'').'_CATEGORY_'.($isNew?'ADD':'EDIT').'_TITLE')) {
$title = JText::_($component_title_key);
$title = MolajoText::_($component_title_key);
}
// Else if the component section string exits, let's use it
elseif ($lang->hasKey($component_section_key = $component.($section?"_$section":''))) {
$title = JText::sprintf( 'COM_CATEGORIES_CATEGORY_'.($isNew?'ADD':'EDIT').'_TITLE', $this->escape(JText::_($component_section_key)));
$title = MolajoText::sprintf( 'COM_CATEGORIES_CATEGORY_'.($isNew?'ADD':'EDIT').'_TITLE', $this->escape(MolajoText::_($component_section_key)));
}
// Else use the base title
else {
$title = JText::_('COM_CATEGORIES_CATEGORY_BASE_'.($isNew?'ADD':'EDIT').'_TITLE');
$title = MolajoText::_('COM_CATEGORIES_CATEGORY_BASE_'.($isNew?'ADD':'EDIT').'_TITLE');
}

// Load specific css component
@@ -142,7 +142,7 @@ protected function addToolbar()
// -remotely searching in a component URL if helpURL param exists in the component and is NOT set to ''
if ($lang->hasKey($lang_help_url = strtoupper($component).'_HELP_URL')) {
$debug = $lang->setDebug(false);
$url = JText::_($lang_help_url);
$url = MolajoText::_($lang_help_url);
$lang->setDebug($debug);
}
else {
2 administrator/components/com_checkin/checkin.php
View file
@@ -12,7 +12,7 @@

// Access check.
if (!MolajoFactory::getUser()->authorise('core.admin')) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

// Include dependancies
12 administrator/components/com_checkin/controller.php
View file
@@ -34,20 +34,20 @@ public function display($cachable = false, $urlparams = false)
public function checkin()
{
// Check for request forgeries
JRequest::checkToken() or jexit(JText::_('JInvalid_Token'));
JRequest::checkToken() or jexit(MolajoText::_('JInvalid_Token'));

// Initialise variables.
$ids = JRequest::getVar('cid', array(), '', 'array');

if (empty($ids)) {
JError::raiseWarning(500, JText::_('MOLAJO_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
JError::raiseWarning(500, MolajoText::_('MOLAJO_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
}
else {
// Get the model.
$model = $this->getModel();

// Checked in the items.
$this->setMessage(JText::plural('COM_CHECKIN_N_ITEMS_CHECKED_IN', $model->checkin($ids)));
$this->setMessage(MolajoText::plural('COM_CHECKIN_N_ITEMS_CHECKED_IN', $model->checkin($ids)));
}

$this->setRedirect('index.php?option=com_checkin');
@@ -64,18 +64,18 @@ public function checkin()
protected function addSubmenu($vName)
{
JSubMenuHelper::addEntry(
JText::_('JGLOBAL_SUBMENU_CHECKIN'),
MolajoText::_('JGLOBAL_SUBMENU_CHECKIN'),
'index.php?option=com_checkin',
$vName == 'com_checkin'
);

JSubMenuHelper::addEntry(
JText::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
MolajoText::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
'index.php?option=com_cache',
$vName == 'cache'
);
JSubMenuHelper::addEntry(
JText::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
MolajoText::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
'index.php?option=com_cache&view=purge',
$vName == 'purge'
);
12 administrator/components/com_checkin/views/checkin/tmpl/default.php
View file
@@ -15,11 +15,11 @@
<form action="<?php echo MolajoRoute::_('index.php?option=com_checkin');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CHECKIN_FILTER_SEARCH_DESC'); ?>" />
<label class="filter-search-lbl" for="filter_search"><?php echo MolajoText::_('JSEARCH_FILTER_LABEL'); ?></label>
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo MolajoText::_('COM_CHECKIN_FILTER_SEARCH_DESC'); ?>" />

<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
<button type="submit" class="btn"><?php echo MolajoText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo MolajoText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
</fieldset>
<div class="clr"> </div>
@@ -28,7 +28,7 @@
<thead>
<tr>
<th width="1%">
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo MolajoText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
</th>
<th class="left"><?php echo JHtml::_('grid.sort', 'COM_CHECKIN_DATABASE_TABLE', 'table', $listDirn, $listOrder); ?></th>
<th><?php echo JHtml::_('grid.sort', 'COM_CHECKIN_ITEMS_TO_CHECK_IN', 'count', $listDirn, $listOrder); ?></th>
@@ -38,7 +38,7 @@
<?php foreach ($this->items as $table => $count): $i=0;?>
<tr class="row<?php echo $i%2; ?>">
<td class="center"><?php echo JHtml::_('grid.id', $i, $table); ?></td>
<td><?php echo JText::sprintf('COM_CHECKIN_TABLE',$table); ?></td>
<td><?php echo MolajoText::sprintf('COM_CHECKIN_TABLE',$table); ?></td>
<td width="200" class="center"><?php echo $count; ?></td>
</tr>
<?php endforeach;?>
2 administrator/components/com_checkin/views/checkin/view.html.php
View file
@@ -47,7 +47,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
MolajoToolbarHelper::title(JText::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin.png');
MolajoToolbarHelper::title(MolajoText::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin.png');
if (MolajoFactory::getUser()->authorise('core.admin', 'com_checkin')) {
MolajoToolbarHelper::custom('checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
MolajoToolbarHelper::divider();
2 administrator/components/com_config/controller.php
View file
@@ -54,7 +54,7 @@ public function display($cachable = false, $urlparams = false)

// Access check.
if (!MolajoFactory::getUser()->authorise('core.admin', $model->getState('component.option'))) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

// Push the model into the view (as default).
14 administrator/components/com_config/controllers/application.php
View file
@@ -44,7 +44,7 @@ public function save()
// Check if the user is authorized to do this.
if (!MolajoFactory::getUser()->authorise('core.admin'))
{
MolajoFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
MolajoFactory::getApplication()->redirect('index.php', MolajoText::_('JERROR_ALERTNOAUTHOR'));
return;
}

@@ -94,13 +94,13 @@ public function save()
$app->setUserState('com_config.config.global.data', $data);

// Save failed, go back to the screen and display a notice.
$message = JText::sprintf('JERROR_SAVE_FAILED', $model->getError());
$message = MolajoText::sprintf('JERROR_SAVE_FAILED', $model->getError());
$this->setRedirect('index.php?option=com_config&view=application', $message, 'error');
return false;
}

// Set the success message.
$message = JText::_('COM_CONFIG_SAVE_SUCCESS');
$message = MolajoText::_('COM_CONFIG_SAVE_SUCCESS');

// Set the redirect based on the task.
switch ($this->getTask())
@@ -126,7 +126,7 @@ function cancel()
// Check if the user is authorized to do this.
if (!MolajoFactory::getUser()->authorise('core.admin', 'com_config'))
{
MolajoFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
MolajoFactory::getApplication()->redirect('index.php', MolajoText::_('JERROR_ALERTNOAUTHOR'));
return;
}

@@ -146,11 +146,11 @@ function refreshHelp()
JClientHelper::setCredentialsFromRequest('ftp');

if (($data = file_get_contents('http://help.joomla.org/helpsites.xml')) === false) {
$this->setRedirect('index.php?option=com_config', JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 'error');
$this->setRedirect('index.php?option=com_config', MolajoText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 'error');
} else if (!JFile::write(JPATH_BASE . '/help/helpsites.xml', $data)) {
$this->setRedirect('index.php?option=com_config', JText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 'error');
$this->setRedirect('index.php?option=com_config', MolajoText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 'error');
} else {
$this->setRedirect('index.php?option=com_config', JText::_('COM_CONFIG_HELPREFRESH_SUCCESS'));
$this->setRedirect('index.php?option=com_config', MolajoText::_('COM_CONFIG_HELPREFRESH_SUCCESS'));
}
}

6 administrator/components/com_config/controllers/component.php
View file
@@ -54,7 +54,7 @@ function save()
// Check if the user is authorized to do this.
if (!MolajoFactory::getUser()->authorise('core.admin', $option))
{
MolajoFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
MolajoFactory::getApplication()->redirect('index.php', MolajoText::_('JERROR_ALERTNOAUTHOR'));
return;
}

@@ -98,7 +98,7 @@ function save()
$app->setUserState('com_config.config.global.data', $data);

// Save failed, go back to the screen and display a notice.
$message = JText::sprintf('JERROR_SAVE_FAILED', $model->getError());
$message = MolajoText::sprintf('JERROR_SAVE_FAILED', $model->getError());
$this->setRedirect('index.php?option=com_config&view=component&component='.$option.'&tmpl=component', $message, 'error');
return false;
}
@@ -107,7 +107,7 @@ function save()
switch ($this->getTask())
{
case 'apply':
$message = JText::_('COM_CONFIG_SAVE_SUCCESS');
$message = MolajoText::_('COM_CONFIG_SAVE_SUCCESS');
$this->setRedirect('index.php?option=com_config&view=component&component='.$option.'&tmpl=component', $message);
break;

6 administrator/components/com_config/models/application.php
View file
@@ -150,19 +150,19 @@ public function save($data)

// Attempt to make the file writeable if using FTP.
if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0644')) {
JError::raiseNotice('SOME_ERROR_CODE', JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE'));
JError::raiseNotice('SOME_ERROR_CODE', MolajoText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE'));
}

// Attempt to write the configuration file as a PHP class named MolajoConfig.
$configString = $config->toString('PHP', array('class' => 'MolajoConfig', 'closingtag' => false));
if (!JFile::write($file, $configString)) {
$this->setError(JText::_('COM_CONFIG_ERROR_WRITE_FAILED'));
$this->setError(MolajoText::_('COM_CONFIG_ERROR_WRITE_FAILED'));
return false;
}

// Attempt to make the file unwriteable if using FTP.
if ($data['ftp_enable'] == 0 && !$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0444')) {
JError::raiseNotice('SOME_ERROR_CODE', JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE'));
JError::raiseNotice('SOME_ERROR_CODE', MolajoText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE'));
}

return true;
2 administrator/components/com_config/views/application/tmpl/default_cache.php
View file
@@ -13,7 +13,7 @@
<div class="width-100">

<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_CACHE_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_CACHE_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('cache') as $field):
2 administrator/components/com_config/views/application/tmpl/default_cookie.php
View file
@@ -14,7 +14,7 @@
<div class="width-100">

<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_COOKIE_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_COOKIE_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('cookie') as $field):
2 administrator/components/com_config/views/application/tmpl/default_database.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_DATABASE_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_DATABASE_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('database') as $field):
2 administrator/components/com_config/views/application/tmpl/default_debug.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_DEBUG_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_DEBUG_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('debug') as $field):
2 administrator/components/com_config/views/application/tmpl/default_ftp.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_FTP_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_FTP_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('ftp') as $field):
12 administrator/components/com_config/views/application/tmpl/default_ftplogin.php
View file
@@ -11,18 +11,18 @@
defined('_JEXEC') or die;
?>
<div class="width-100">
<fieldset title="<?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?>" class="adminform">
<legend><?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
<?php echo JText::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
<fieldset title="<?php echo MolajoText::_('COM_CONFIG_FTP_DETAILS'); ?>" class="adminform">
<legend><?php echo MolajoText::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
<?php echo MolajoText::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>

<?php if (JError::isError($this->ftp)): ?>
<p><?php echo JText::_($this->ftp->message); ?></p>
<p><?php echo MolajoText::_($this->ftp->message); ?></p>
<?php endif; ?>
<ul class="adminformlist">
<li><label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
<li><label for="username"><?php echo MolajoText::_('JGLOBAL_USERNAME'); ?></label>
<input type="text" id="username" name="username" class="input_box" size="70" value="" /></li>

<li><label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
<li><label for="password"><?php echo MolajoText::_('JGLOBAL_PASSWORD'); ?></label>
<input type="password" id="password" name="password" class="input_box" size="70" value="" /></li>
</ul>
</fieldset>
2 administrator/components/com_config/views/application/tmpl/default_locale.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_LOCATION_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_LOCATION_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('locale') as $field):
2 administrator/components/com_config/views/application/tmpl/default_mail.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_MAIL_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_MAIL_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('mail') as $field):
2 administrator/components/com_config/views/application/tmpl/default_metadata.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform long">
<legend><?php echo JText::_('COM_CONFIG_METADATA_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_METADATA_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('metadata') as $field):
8 administrator/components/com_config/views/application/tmpl/default_navigation.php
View file
@@ -14,10 +14,10 @@
<div class="submenu-box">
<div class="submenu-pad">
<ul id="submenu" class="configuration">
<li><a href="#" onclick="return false;" id="site" class="active"><?php echo JText::_('JSITE'); ?></a></li>
<li><a href="#" onclick="return false;" id="system"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></a></li>
<li><a href="#" onclick="return false;" id="server"><?php echo JText::_('COM_CONFIG_SERVER'); ?></a></li>
<li><a href="#" onclick="return false;" id="permissions"><?php echo JText::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
<li><a href="#" onclick="return false;" id="site" class="active"><?php echo MolajoText::_('JSITE'); ?></a></li>
<li><a href="#" onclick="return false;" id="system"><?php echo MolajoText::_('COM_CONFIG_SYSTEM'); ?></a></li>
<li><a href="#" onclick="return false;" id="server"><?php echo MolajoText::_('COM_CONFIG_SERVER'); ?></a></li>
<li><a href="#" onclick="return false;" id="permissions"><?php echo MolajoText::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
</ul>
<div class="clr"></div>
</div>
2 administrator/components/com_config/views/application/tmpl/default_permissions.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_PERMISSION_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_PERMISSION_SETTINGS'); ?></legend>
<?php foreach ($this->form->getFieldset('permissions') as $field): ?>
<?php echo $field->label; ?>
<div class="clr"> </div>
2 administrator/components/com_config/views/application/tmpl/default_seo.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform long">
<legend><?php echo JText::_('COM_CONFIG_SEO_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_SEO_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('seo') as $field):
2 administrator/components/com_config/views/application/tmpl/default_server.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_SERVER_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_SERVER_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('server') as $field):
2 administrator/components/com_config/views/application/tmpl/default_session.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_SESSION_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_SESSION_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('session') as $field):
2 administrator/components/com_config/views/application/tmpl/default_site.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_SITE_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_SITE_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('site') as $field):
2 administrator/components/com_config/views/application/tmpl/default_system.php
View file
@@ -12,7 +12,7 @@
?>
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CONFIG_SYSTEM_SETTINGS'); ?></legend>
<legend><?php echo MolajoText::_('COM_CONFIG_SYSTEM_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php
foreach ($this->form->getFieldset('system') as $field):
2 administrator/components/com_config/views/application/view.html.php
View file
@@ -67,7 +67,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
MolajoToolbarHelper::title(JText::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'config.png');
MolajoToolbarHelper::title(MolajoText::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'config.png');
MolajoToolbarHelper::apply('application.apply');
MolajoToolbarHelper::save('application.save');
MolajoToolbarHelper::divider();
12 administrator/components/com_config/views/component/tmpl/default.php
View file
@@ -28,14 +28,14 @@
<fieldset>
<div class="fltrt">
<button type="button" onclick="Joomla.submitform('component.apply', this.form);">
<?php echo JText::_('JAPPLY');?></button>
<?php echo MolajoText::_('JAPPLY');?></button>
<button type="button" onclick="Joomla.submitform('component.save', this.form);">
<?php echo JText::_('JSAVE');?></button>
<?php echo MolajoText::_('JSAVE');?></button>
<button type="button" onclick="window.parent.SqueezeBox.close();">
<?php echo JText::_('JCANCEL');?></button>
<?php echo MolajoText::_('JCANCEL');?></button>
</div>
<div class="configuration" >
<?php echo JText::_($this->component->option.'_configuration') ?>
<?php echo MolajoText::_($this->component->option.'_configuration') ?>
</div>
</fieldset>

@@ -44,9 +44,9 @@
$fieldSets = $this->form->getFieldsets();
foreach ($fieldSets as $name => $fieldSet) :
$label = empty($fieldSet->label) ? 'COM_CONFIG_'.$name.'_FIELDSET_LABEL' : $fieldSet->label;
echo JHtml::_('tabs.panel',JText::_($label), 'publishing-details');
echo JHtml::_('tabs.panel',MolajoText::_($label), 'publishing-details');
if (isset($fieldSet->description) && !empty($fieldSet->description)) :
echo '<p class="tab-description">'.JText::_($fieldSet->description).'</p>';
echo '<p class="tab-description">'.MolajoText::_($fieldSet->description).'</p>';
endif;
?>
<ul class="config-option-list">
2 administrator/components/com_config/views/component/view.html.php
View file
@@ -40,7 +40,7 @@ function display($tpl = null)
$this->assignRef('form', $form);
$this->assignRef('component', $component);

$this->document->setTitle(JText::_('JGLOBAL_EDIT_PREFERENCES'));
$this->document->setTitle(MolajoText::_('JGLOBAL_EDIT_PREFERENCES'));

parent::display($tpl);
JRequest::setVar('hidemainmenu', true);
2 administrator/components/com_dashboard/views/cpanel/tmpl/default.php
View file
@@ -25,7 +25,7 @@
echo JHtml::_('sliders.panel', call_user_func_array(array('mod'.$module->name.'Helper','getTitle'), array($params)), 'cpanel-panel-'.$module->name);
}
else {
echo JHtml::_('sliders.panel', JText::_('MOD_'.$module->name.'_TITLE'), 'cpanel-panel-'.$module->name);
echo JHtml::_('sliders.panel', MolajoText::_('MOD_'.$module->name.'_TITLE'), 'cpanel-panel-'.$module->name);
}
echo $output;
}
2 administrator/components/com_dashboard/views/cpanel/view.html.php
View file
@@ -28,7 +28,7 @@ class CpanelViewCpanel extends JView
public function display($tpl = null)
{
// Set toolbar items for the page
MolajoToolbarHelper::title(JText::_('COM_CPANEL'), 'cpanel.png');
MolajoToolbarHelper::title(MolajoText::_('COM_CPANEL'), 'cpanel.png');
MolajoToolbarHelper::help('screen.cpanel');

/*
4 administrator/components/com_installer/controllers/manage.php
View file
@@ -49,7 +49,7 @@ public function publish()
$value = JArrayHelper::getValue($values, $task, 0, 'int');

if (empty($ids)) {
JError::raiseWarning(500, JText::_('COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED'));
JError::raiseWarning(500, MolajoText::_('COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED'));
} else {
// Get the model.
$model = $this->getModel('manage');
@@ -63,7 +63,7 @@ public function publish()
} else if ($value == 0) {
$ntext = 'COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED';
}
$this->setMessage(JText::plural($ntext, count($ids)));
$this->setMessage(MolajoText::plural($ntext, count($ids)));
}
}

10 administrator/components/com_installer/helpers/installer.php
View file
@@ -27,27 +27,27 @@ class InstallerHelper
public static function addSubmenu($vName = 'install')
{
JSubMenuHelper::addEntry(
JText::_('COM_INSTALLER_SUBMENU_INSTALL'),
MolajoText::_('COM_INSTALLER_SUBMENU_INSTALL'),
'index.php?option=com_installer',
$vName == 'install'
);
JSubMenuHelper::addEntry(
JText::_('COM_INSTALLER_SUBMENU_UPDATE'),
MolajoText::_('COM_INSTALLER_SUBMENU_UPDATE'),
'index.php?option=com_installer&view=update',
$vName == 'update'
);
JSubMenuHelper::addEntry(
JText::_('COM_INSTALLER_SUBMENU_MANAGE'),
MolajoText::_('COM_INSTALLER_SUBMENU_MANAGE'),
'index.php?option=com_installer&view=manage',
$vName == 'manage'
);
JSubMenuHelper::addEntry(
JText::_('COM_INSTALLER_SUBMENU_DISCOVER'),
MolajoText::_('COM_INSTALLER_SUBMENU_DISCOVER'),
'index.php?option=com_installer&view=discover',
$vName == 'discover'
);
JSubMenuHelper::addEntry(
JText::_('COM_INSTALLER_SUBMENU_WARNINGS'),
MolajoText::_('COM_INSTALLER_SUBMENU_WARNINGS'),
'index.php?option=com_installer&view=warnings',
$vName == 'warnings'
);
2 administrator/components/com_installer/installer.php
View file
@@ -13,7 +13,7 @@

// Access check.
if (!MolajoFactory::getUser()->authorise('core.manage', 'com_installer')) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

$controller = JController::getInstance('Installer');
10 administrator/components/com_installer/models/discover.php
View file
@@ -116,18 +116,18 @@ function discover_install()
$result = $installer->discover_install($id);
if (!$result) {
$failed = true;
$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_INSTALLFAILED').': '. $id);
$app->enqueueMessage(MolajoText::_('COM_INSTALLER_MSG_DISCOVER_INSTALLFAILED').': '. $id);
}
}
$this->setState('action', 'remove');
$this->setState('name', $installer->get('name'));
$app->setUserState('com_installer.message', $installer->message);
$app->setUserState('com_installer.extension_message', $installer->get('extension_message'));
if (!$failed) {
$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_INSTALLSUCCESSFUL'));
$app->enqueueMessage(MolajoText::_('COM_INSTALLER_MSG_DISCOVER_INSTALLSUCCESSFUL'));
}
} else {
$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED'));
$app->enqueueMessage(MolajoText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED'));
}
}

@@ -145,10 +145,10 @@ function purge()
$query->where('state = -1');
$db->setQuery((string)$query);
if ($db->Query()) {
$this->_message = JText::_('COM_INSTALLER_MSG_DISCOVER_PURGEDDISCOVEREDEXTENSIONS');
$this->_message = MolajoText::_('COM_INSTALLER_MSG_DISCOVER_PURGEDDISCOVEREDEXTENSIONS');
return true;
} else {
$this->_message = JText::_('COM_INSTALLER_MSG_DISCOVER_FAILEDTOPURGEEXTENSIONS');
$this->_message = MolajoText::_('COM_INSTALLER_MSG_DISCOVER_FAILEDTOPURGEEXTENSIONS');
return false;
}
}
6 administrator/components/com_installer/models/extension.php
View file
@@ -113,7 +113,7 @@ private function translate(&$items)
}
}
$item->author_info = @$item->authorEmail .'<br />'. @$item->authorUrl;
$item->application = $item->application_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE');
$item->application = $item->application_id ? MolajoText::_('JADMINISTRATOR') : MolajoText::_('JSITE');
$path = $item->application_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
switch ($item->type) {
case 'component':
@@ -164,8 +164,8 @@ private function translate(&$items)
|| $lang->load("$extension.sys", $source, $lang->getDefault(), false, false);
break;
}
$item->name = JText::_($item->name);
$item->description = JText::_(@$item->description);
$item->name = MolajoText::_($item->name);
$item->description = MolajoText::_(@$item->description);
}
}
}
6 administrator/components/com_installer/models/fields/client.php
View file
@@ -37,10 +37,10 @@ protected function getInput()
$onchange = $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
$options = array();
foreach ($this->element->children() as $option) {
$options[] = JHtml::_('select.option', $option->attributes('value'), JText::_(trim($option->data())));
$options[] = JHtml::_('select.option', $option->attributes('value'), MolajoText::_(trim($option->data())));
}
$options[] = JHtml::_('select.option', '0', JText::sprintf('JSITE'));
$options[] = JHtml::_('select.option', '1', JText::sprintf('JADMINISTRATOR'));
$options[] = JHtml::_('select.option', '0', MolajoText::sprintf('JSITE'));
$options[] = JHtml::_('select.option', '1', MolajoText::sprintf('JADMINISTRATOR'));
$return = JHtml::_('select.genericlist', $options, $this->name, $onchange, 'value', 'text', $this->value, $this->id);
return $return;
}
2 administrator/components/com_installer/models/fields/group.php
View file
@@ -40,7 +40,7 @@ protected function getInput()
$options = array();

foreach ($this->element->children() as $option) {
$options[] = JHtml::_('select.option', (string)$option->attributes()->value, JText::_(trim($option->data())));
$options[] = JHtml::_('select.option', (string)$option->attributes()->value, MolajoText::_(trim($option->data())));
}

$dbo = MolajoFactory::getDbo();
6 administrator/components/com_installer/models/fields/search.php
View file
@@ -37,9 +37,9 @@ class JFormFieldSearch extends JFormField
protected function getInput()
{
$html = '';
$html.= '<input type="text" name="' . $this->name . '" id="' . $this->id . '" value="' . htmlspecialchars($this->value) . '" title="' . JText::_('JSEARCH_FILTER') . '" onchange="this.form.submit();" />';
$html.= '<button type="submit" class="btn">' . JText::_('JSEARCH_FILTER_SUBMIT') . '</button>';
$html.= '<button type="button" class="btn" onclick="document.id(\'' . $this->id . '\').value=\'\';this.form.submit();">' . JText::_('JSEARCH_FILTER_CLEAR') . '</button>';
$html.= '<input type="text" name="' . $this->name . '" id="' . $this->id . '" value="' . htmlspecialchars($this->value) . '" title="' . MolajoText::_('JSEARCH_FILTER') . '" onchange="this.form.submit();" />';
$html.= '<button type="submit" class="btn">' . MolajoText::_('JSEARCH_FILTER_SUBMIT') . '</button>';
$html.= '<button type="button" class="btn" onclick="document.id(\'' . $this->id . '\').value=\'\';this.form.submit();">' . MolajoText::_('JSEARCH_FILTER_CLEAR') . '</button>';
return $html;
}
}
4 administrator/components/com_installer/models/fields/type.php
View file
@@ -39,7 +39,7 @@ protected function getInput()
$onchange = $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
$options = array();
foreach ($this->element->children() as $option) {
$options[] = JHtml::_('select.option', $option->attributes('value'), JText::_(trim($option->data())));
$options[] = JHtml::_('select.option', $option->attributes('value'), MolajoText::_(trim($option->data())));
}

$db = MolajoFactory::getDBO();
@@ -49,7 +49,7 @@ protected function getInput()
$types = array_unique($db->loadResultArray());
foreach($types as $type)
{
$options[] = JHtml::_('select.option', $type, JText::_('COM_INSTALLER_TYPE_'. strtoupper($type)));
$options[] = JHtml::_('select.option', $type, MolajoText::_('COM_INSTALLER_TYPE_'. strtoupper($type)));
}

$return = JHtml::_('select.genericlist', $options, $this->name, $onchange, 'value', 'text', $this->value, $this->id);
24 administrator/components/com_installer/models/install.php
View file
@@ -95,14 +95,14 @@ function install()
break;

default:
$app->setUserState('com_installer.message', JText::_('COM_INSTALLER_NO_INSTALL_TYPE_FOUND'));
$app->setUserState('com_installer.message', MolajoText::_('COM_INSTALLER_NO_INSTALL_TYPE_FOUND'));
return false;
break;
}

// Was the package unpacked?
if (!$package) {
$app->setUserState('com_installer.message', JText::_('COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE'));
$app->setUserState('com_installer.message', MolajoText::_('COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE'));
return false;
}

@@ -112,11 +112,11 @@ function install()
// Install the package
if (!$installer->install($package['dir'])) {
// There was an error installing the package
$msg = JText::sprintf('COM_INSTALLER_INSTALL_ERROR', JText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$msg = MolajoText::sprintf('COM_INSTALLER_INSTALL_ERROR', MolajoText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$result = false;
} else {
// Package installed sucessfully
$msg = JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$msg = MolajoText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', MolajoText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$result = true;
}

@@ -153,25 +153,25 @@ protected function _getPackageFromUpload()

// Make sure that file uploads are enabled in php
if (!(bool) ini_get('file_uploads')) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'));
return false;
}

// Make sure that zlib is loaded so that the package can be unpacked
if (!extension_loaded('zlib')) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB'));
return false;
}

// If there is no uploaded file, we have a problem...
if (!is_array($userfile)) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED'));
return false;
}

// Check if there was a problem uploading the file.
if ($userfile['error'] || $userfile['size'] < 1) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'));
return false;
}

@@ -204,7 +204,7 @@ protected function _getPackageFromFolder()

// Did you give us a valid directory?
if (!is_dir($p_dir)) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
return false;
}

@@ -213,7 +213,7 @@ protected function _getPackageFromFolder()

// Did you give us a valid package?
if (!$type) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
return false;
}

@@ -241,7 +241,7 @@ protected function _getPackageFromUrl()

// Did you give us a URL?
if (!$url) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL'));
return false;
}

@@ -250,7 +250,7 @@ protected function _getPackageFromUrl()

// Was the package downloaded?
if (!$p_file) {
JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_INVALID_URL'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_MSG_INSTALL_INVALID_URL'));
return false;
}

12 administrator/components/com_installer/models/manage.php
View file
@@ -112,7 +112,7 @@ function publish(&$eid = array(), $value = 1)
if ($table->type == 'template') {
$style = JTable::getInstance('Style', 'TemplatesTable');
if ($style->load(array('template' => $table->element, 'application_id' => $table->application_id, 'home'=>1))) {
JError::raiseNotice(403, JText::_('COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED'));
JError::raiseNotice(403, MolajoText::_('COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED'));
unset($eid[$i]);
continue;
}
@@ -125,7 +125,7 @@ function publish(&$eid = array(), $value = 1)
}
} else {
$result = false;
JError::raiseWarning(403, JText::_('MOLAJO_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
JError::raiseWarning(403, MolajoText::_('MOLAJO_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
}
return $result;
}
@@ -209,20 +209,20 @@ function remove($eid = array())
}

$langstring = 'COM_INSTALLER_TYPE_TYPE_'. strtoupper($row->type);
$rowtype = JText::_($langstring);
$rowtype = MolajoText::_($langstring);
if(strpos($rowtype, $langstring) !== false) {
$rowtype = $row->type;
}

if (count($failed)) {

// There was an error in uninstalling the package
$msg = JText::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype);
$msg = MolajoText::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype);
$result = false;
} else {

// Package uninstalled sucessfully
$msg = JText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype);
$msg = MolajoText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype);
$result = true;
}
$app = MolajoFactory::getApplication();
@@ -234,7 +234,7 @@ function remove($eid = array())
return $result;
} else {
$result = false;
JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
JError::raiseWarning(403, MolajoText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
}
}

16 administrator/components/com_installer/models/update.php
View file
@@ -108,10 +108,10 @@ public function purge()
// This may or may not mean depending on your database
$db->setQuery('TRUNCATE TABLE #__updates');
if ($db->Query()) {
$this->_message = JText::_('COM_INSTALLER_PURGED_UPDATES');
$this->_message = MolajoText::_('COM_INSTALLER_PURGED_UPDATES');
return true;
} else {
$this->_message = JText::_('COM_INSTALLER_FAILED_TO_PURGE_UPDATES');
$this->_message = MolajoText::_('COM_INSTALLER_FAILED_TO_PURGE_UPDATES');
return false;
}
}
@@ -128,11 +128,11 @@ public function enableSites()
$db->setQuery('UPDATE #__update_sites SET enabled = 1 WHERE enabled = 0');
if ($db->Query()) {
if ($rows = $db->getAffectedRows()) {
$this->_message .= JText::plural('COM_INSTALLER_ENABLED_UPDATES', $rows);
$this->_message .= MolajoText::plural('COM_INSTALLER_ENABLED_UPDATES', $rows);
}
return true;
} else {
$this->_message .= JText::_('COM_INSTALLER_FAILED_TO_ENABLE_UPDATES');
$this->_message .= MolajoText::_('COM_INSTALLER_FAILED_TO_ENABLE_UPDATES');
return false;
}
}
@@ -180,7 +180,7 @@ private function install($update)
if (isset($update->get('downloadurl')->_data)) {
$url = $update->downloadurl->_data;
} else {
JError::raiseWarning('', JText::_('COM_INSTALLER_INVALID_EXTENSION_UPDATE'));
JError::raiseWarning('', MolajoText::_('COM_INSTALLER_INVALID_EXTENSION_UPDATE'));
return false;
}

@@ -189,7 +189,7 @@ private function install($update)

// Was the package downloaded?
if (!$p_file) {
JError::raiseWarning('', JText::sprintf('COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED', $url));
JError::raiseWarning('', MolajoText::sprintf('COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED', $url));
return false;
}

@@ -206,11 +206,11 @@ private function install($update)
// Install the package
if (!$installer->update($package['dir'])) {
// There was an error updating the package
$msg = JText::sprintf('COM_INSTALLER_MSG_UPDATE_ERROR', JText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$msg = MolajoText::sprintf('COM_INSTALLER_MSG_UPDATE_ERROR', MolajoText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$result = false;
} else {
// Package updated successfully
$msg = JText::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$msg = MolajoText::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS', MolajoText::_('COM_INSTALLER_TYPE_TYPE_'.strtoupper($package['type'])));
$result = true;
}

20 administrator/components/com_installer/models/warnings.php
View file
@@ -68,34 +68,34 @@ function getItems()
$file_uploads = ini_get('file_uploads');
if(!$file_uploads)
{
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC'));
}


$upload_dir = ini_get('upload_tmp_dir');
if (!$upload_dir) {
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC'));
} else {
if (!is_writeable($upload_dir)) {
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'), 'description'=>JText::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'), 'description'=>MolajoText::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir));
}
}

$config = MolajoFactory::getConfig();
$tmp_path = $config->get('tmp_path');
if (!$tmp_path) {
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC'));
} else {
if (!is_writeable($tmp_path)) {
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'), 'description'=>JText::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'), 'description'=>MolajoText::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path));
}
}

$memory_limit = $this->return_bytes(ini_get('memory_limit'));
if ($memory_limit < (8 * 1024 * 1024)) { // 8MB
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC'));
} else if ($memory_limit < (16 * 1024 * 1024)) { //16MB
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC'));
}


@@ -104,17 +104,17 @@ function getItems()

if($post_max_size < $upload_max_filesize)
{
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC'));
}

if($post_max_size < (4 * 1024 * 1024)) // 4MB
{
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC'));
}

if($upload_max_filesize < (4 * 1024 * 1024)) // 4MB
{
$messages[] = Array('message'=>JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'), 'description'=>JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC'));
$messages[] = Array('message'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'), 'description'=>MolajoText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC'));
}


12 administrator/components/com_installer/views/default/tmpl/default_ftp.php
View file
@@ -11,28 +11,28 @@
// no direct access
defined('_JEXEC') or die;
?>
<fieldset title="<?php echo JText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?>">
<legend><?php echo JText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
<fieldset title="<?php echo MolajoText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?>">
<legend><?php echo MolajoText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>

<?php echo JText::_('COM_INSTALLER_MSG_DESCFTP'); ?>
<?php echo MolajoText::_('COM_INSTALLER_MSG_DESCFTP'); ?>

<?php if (JError::isError($this->ftp)): ?>
<p><?php echo JText::_($this->ftp->getMessage()); ?></p>
<p><?php echo MolajoText::_($this->ftp->getMessage()); ?></p>
<?php endif; ?>

<table class="adminform">
<tbody>
<tr>
<td width="120">
<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
<label for="username"><?php echo MolajoText::_('JGLOBAL_USERNAME'); ?></label>
</td>
<td>
<input type="text" id="username" name="username" class="input_box" size="70" value="" />
</td>
</tr>
<tr>
<td width="120">
<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
<label for="password"><?php echo MolajoText::_('JGLOBAL_PASSWORD'); ?></label>
</td>
<td>
<input type="password" id="password" name="password" class="input_box" size="70" value="" />
4 administrator/components/com_installer/views/default/view.php
View file
@@ -64,7 +64,7 @@ function display($tpl=null)
protected function addToolbar()
{
$canDo = InstallerHelper::getActions();
MolajoToolbarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'install.png');
MolajoToolbarHelper::title(MolajoText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'install.png');

if ($canDo->get('core.admin')) {
MolajoToolbarHelper::preferences('com_installer');
@@ -73,6 +73,6 @@ protected function addToolbar()

// Document
$document = MolajoFactory::getDocument();
$document->setTitle(JText::_('COM_INSTALLER_TITLE_' . $this->getName()));
$document->setTitle(MolajoText::_('COM_INSTALLER_TITLE_' . $this->getName()));
}
}
20 administrator/components/com_installer/views/discover/tmpl/default.php
View file
@@ -29,14 +29,14 @@
<table class="adminlist">
<thead>
<tr>
<th width="20"><input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" /></th>
<th width="20"><input type="checkbox" name="checkall-toggle" value="" title="<?php echo MolajoText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" /></th>
<th class="nowrap"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?></th>
<th class="center"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?></th>
<th width="10%" class="center"><?php echo JText::_('MOLAJOVERSION'); ?></th>
<th width="10%" class="center"><?php echo JText::_('JDATE'); ?></th>
<th width="10%" class="center"><?php echo MolajoText::_('MOLAJOVERSION'); ?></th>
<th width="10%" class="center"><?php echo MolajoText::_('JDATE'); ?></th>
<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?></th>
<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_CLIENT', 'application_id', $listDirn, $listOrder); ?></th>
<th width="15%" class="center"><?php echo JText::_('JAUTHOR'); ?></th>
<th width="15%" class="center"><?php echo MolajoText::_('JAUTHOR'); ?></th>
<th width="10"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?></th>
</tr>
</thead>
@@ -47,13 +47,13 @@
<tr class="row<?php echo $i%2;?>">
<td><?php echo JHtml::_('grid.id', $i, $item->extension_id); ?></td>
<td><span class="bold hasTip" title="<?php echo htmlspecialchars($item->name.'::'.$item->description); ?>"><?php echo $item->name; ?></span></td>
<td class="center"><?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?></td>
<td class="center"><?php echo MolajoText::_('COM_INSTALLER_TYPE_' . $item->type); ?></td>
<td class="center"><?php echo @$item->version != '' ? $item->version : '&#160;'; ?></td>
<td class="center"><?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?></td>
<td class="center"><?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
<td class="center"><?php echo @$item->folder != '' ? $item->folder : MolajoText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
<td class="center"><?php echo $item->application; ?></td>
<td class="center">
<span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(JText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$item->author_info)); ?>">
<span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(MolajoText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$item->author_info)); ?>">
<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
</span>
</td>
@@ -62,13 +62,13 @@
<?php endforeach; ?>
</tbody>
</table>
<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
<?php echo MolajoText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
<?php else : ?>
<p>
<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
<?php echo MolajoText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
</p>
<p>
<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSION'); ?>
<?php echo MolajoText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSION'); ?>
</p>
<?php endif; ?>

2 administrator/components/com_installer/views/discover/tmpl/default_item.php
View file
@@ -31,7 +31,7 @@
<td class="center"><?php echo @$this->item->folder != '' ? $this->item->folder : 'N/A'; ?></td>
<td class="center"><?php echo @$this->item->application != '' ? $this->item->application : 'N/A'; ?></td>
<td>
<span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(JText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$this->item->author_info)); ?>">
<span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(MolajoText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$this->item->author_info)); ?>">
<?php echo @$this->item->author != '' ? $this->item->author : '&#160;'; ?>
</span>
</td>
24 administrator/components/com_installer/views/install/tmpl/default_form.php
View file
@@ -17,7 +17,7 @@

// do field validation
if (form.install_package.value == ""){
alert("<?php echo JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true); ?>");
alert("<?php echo MolajoText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true); ?>");
} else {
form.installtype.value = 'upload';
form.submit();
@@ -29,7 +29,7 @@

// do field validation
if (form.install_directory.value == ""){
alert("<?php echo JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY', true); ?>");
alert("<?php echo MolajoText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY', true); ?>");
} else {
form.installtype.value = 'folder';
form.submit();
@@ -41,7 +41,7 @@

// do field validation
if (form.install_url.value == "" || form.install_url.value == "http://"){
alert("<?php echo JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true); ?>");
alert("<?php echo MolajoText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true); ?>");
} else {
form.installtype.value = 'url';
form.submit();
@@ -56,23 +56,23 @@
<?php endif; ?>
<div class="width-70 fltlft">
<fieldset class="uploadform">
<legend><?php echo JText::_('COM_INSTALLER_UPLOAD_PACKAGE_FILE'); ?></legend>
<label for="install_package"><?php echo JText::_('COM_INSTALLER_PACKAGE_FILE'); ?></label>
<legend><?php echo MolajoText::_('COM_INSTALLER_UPLOAD_PACKAGE_FILE'); ?></legend>
<label for="install_package"><?php echo MolajoText::_('COM_INSTALLER_PACKAGE_FILE'); ?></label>
<input class="input_box" id="install_package" name="install_package" type="file" size="57" />
<input class="button" type="button" value="<?php echo JText::_('COM_INSTALLER_UPLOAD_AND_INSTALL'); ?>" onclick="Joomla.submitbutton()" />
<input class="button" type="button" value="<?php echo MolajoText::_('COM_INSTALLER_UPLOAD_AND_INSTALL'); ?>" onclick="Joomla.submitbutton()" />
</fieldset>
<div class="clr"></div>
<fieldset class="uploadform">
<legend><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_DIRECTORY'); ?></legend>
<label for="install_directory"><?php echo JText::_('COM_INSTALLER_INSTALL_DIRECTORY'); ?></label>
<input type="text" id="install_directory" name="install_directory" class="input_box" size="70" value="<?php echo $this->state->get('install.directory'); ?>" /> <input type="button" class="button" value="<?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>" onclick="Joomla.submitbutton3()" />
<legend><?php echo MolajoText::_('COM_INSTALLER_INSTALL_FROM_DIRECTORY'); ?></legend>
<label for="install_directory"><?php echo MolajoText::_('COM_INSTALLER_INSTALL_DIRECTORY'); ?></label>
<input type="text" id="install_directory" name="install_directory" class="input_box" size="70" value="<?php echo $this->state->get('install.directory'); ?>" /> <input type="button" class="button" value="<?php echo MolajoText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>" onclick="Joomla.submitbutton3()" />
</fieldset>
<div class="clr"></div>
<fieldset class="uploadform">
<legend><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_URL'); ?></legend>
<label for="install_url"><?php echo JText::_('COM_INSTALLER_INSTALL_URL'); ?></label>
<legend><?php echo MolajoText::_('COM_INSTALLER_INSTALL_FROM_URL'); ?></legend>
<label for="install_url"><?php echo MolajoText::_('COM_INSTALLER_INSTALL_URL'); ?></label>
<input type="text" id="install_url" name="install_url" class="input_box" size="70" value="http://" />
<input type="button" class="button" value="<?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>" onclick="Joomla.submitbutton4()" />
<input type="button" class="button" value="<?php echo MolajoText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>" onclick="Joomla.submitbutton4()" />
</fieldset>
<input type="hidden" name="type" value="" />
<input type="hidden" name="installtype" value="upload" />
14 administrator/components/com_installer/views/manage/tmpl/default.php
View file
@@ -32,7 +32,7 @@
<thead>
<tr>
<th width="20">
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo MolajoText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
</th>
<th class="nowrap">
<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
@@ -47,13 +47,13 @@
<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="center">
<?php echo JText::_('MOLAJOVERSION'); ?>
<?php echo MolajoText::_('MOLAJOVERSION'); ?>
</th>
<th width="10%">
<?php echo JText::_('JDATE'); ?>
<?php echo MolajoText::_('JDATE'); ?>
</th>
<th width="15%">
<?php echo JText::_('JAUTHOR'); ?>
<?php echo MolajoText::_('JAUTHOR'); ?>
</th>
<th>
<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?>
@@ -92,7 +92,7 @@
<?php endif; ?>
</td>
<td class="center">
<?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?>
<?php echo MolajoText::_('COM_INSTALLER_TYPE_' . $item->type); ?>
</td>
<td class="center">
<?php echo @$item->version != '' ? $item->version : '&#160;'; ?>
@@ -101,12 +101,12 @@
<?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?>
</td>
<td class="center">
<span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(JText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$item->author_info)); ?>">
<span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(MolajoText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$item->author_info)); ?>">
<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
</span>
</td>
<td class="center">
<?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?>
<?php echo @$item->folder != '' ? $item->folder : MolajoText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?>
</td>
<td>
<?php echo $item->extension_id ?>
2 administrator/components/com_installer/views/manage/view.html.php
View file
@@ -46,7 +46,7 @@ function display($tpl=null)
//Check if there are no matching items
if(!count($this->items)){
MolajoFactory::getApplication()->enqueueMessage(
JText::_('COM_INSTALLER_MSG_MANAGE_NOEXTENSION')
MolajoText::_('COM_INSTALLER_MSG_MANAGE_NOEXTENSION')
);
}

18 administrator/components/com_installer/views/update/tmpl/default.php
View file
@@ -29,14 +29,14 @@
<table class="adminlist" cellspacing="1">
<thead>
<tr>
<th width="20"><input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" /></th>
<th width="20"><input type="checkbox" name="checkall-toggle" value="" title="<?php echo MolajoText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" /></th>
<th class="nowrap"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?></th>
<th class="nowrap"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_INSTALLTYPE', 'extension_id', $listDirn, $listOrder); ?></th>
<th ><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?></th>
<th width="10%" class="center"><?php echo JText::_('MOLAJOVERSION'); ?></th>
<th width="10%" class="center"><?php echo MolajoText::_('MOLAJOVERSION'); ?></th>
<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?></th>
<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_CLIENT', 'application_id', $listDirn, $listOrder); ?></th>
<th width="25%"><?php echo JText::_('COM_INSTALLER_HEADING_DETAILSURL'); ?></th>
<th width="25%"><?php echo MolajoText::_('COM_INSTALLER_HEADING_DETAILSURL'); ?></th>
</tr>
</thead>
<tfoot>
@@ -49,24 +49,24 @@
<tr class="row<?php echo $i%2; ?>">
<td><?php echo JHtml::_('grid.id', $i, $item->update_id); ?></td>
<td>
<span class="editlinktip hasTip" title="<?php echo JText::_('JGLOBAL_DESCRIPTION');?>::<?php echo $item->description ? $item->description : JText::_('COM_INSTALLER_MSG_UPDATE_NODESC'); ?>">
<span class="editlinktip hasTip" title="<?php echo MolajoText::_('JGLOBAL_DESCRIPTION');?>::<?php echo $item->description ? $item->description : MolajoText::_('COM_INSTALLER_MSG_UPDATE_NODESC'); ?>">
<?php echo $item->name; ?>
</span>
</td>
<td class="center">
<?php echo $item->extension_id ? JText::_('COM_INSTALLER_MSG_UPDATE_UPDATE') : JText::_('COM_INSTALLER_NEW_INSTALL') ?>
<?php echo $item->extension_id ? MolajoText::_('COM_INSTALLER_MSG_UPDATE_UPDATE') : MolajoText::_('COM_INSTALLER_NEW_INSTALL') ?>
</td>
<td><?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type) ?></td>
<td><?php echo MolajoText::_('COM_INSTALLER_TYPE_' . $item->type) ?></td>
<td class="center"><?php echo $item->version ?></td>
<td class="center"><?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
<td class="center"><?php echo @$item->application != '' ? JText::_('COM_INSTALLER_TYPE_' . $item->application) : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
<td class="center"><?php echo @$item->folder != '' ? $item->folder : MolajoText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
<td class="center"><?php echo @$item->application != '' ? MolajoText::_('COM_INSTALLER_TYPE_' . $item->application) : MolajoText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
<td><?php echo $item->detailsurl ?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php else : ?>
<p class="nowarning"><?php echo JText::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?></p>
<p class="nowarning"><?php echo MolajoText::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?></p>
<?php endif; ?>

<div>
8 administrator/components/com_installer/views/update/tmpl/default_item.php
View file
@@ -15,21 +15,21 @@
<td><?php echo $this->pagination->getRowOffset($this->item->index); ?></td>
<td>
<input type="checkbox" id="cb<?php echo $this->item->index;?>" name="uid[]" value="<?php echo $this->item->update_id; ?>" onclick="isChecked(this.checked);" />
<span class="editlinktip hasTip" title="<?php echo JText::_('INSTALLER_TIP_UPDATE_DESCRIPTION');?>::<?php echo $this->item->description ? $this->item->description : JText::_('INSTALLER_MSG_UPDATE_NODESC'); ?>">
<span class="editlinktip hasTip" title="<?php echo MolajoText::_('INSTALLER_TIP_UPDATE_DESCRIPTION');?>::<?php echo $this->item->description ? $this->item->description : MolajoText::_('INSTALLER_MSG_UPDATE_NODESC'); ?>">
<?php echo $this->item->name; ?>
</span>
</td>
<td class="center">
<?php echo $this->item->extension_id ? JText::_('INSTALLER_MSG_UPDATE_UPDATE') : JText::_('INSTALLER_MSG_UPDATE_NEW') ?>
<?php echo $this->item->extension_id ? MolajoText::_('INSTALLER_MSG_UPDATE_UPDATE') : MolajoText::_('INSTALLER_MSG_UPDATE_NEW') ?>
</td>
<td>
<?php echo JText::_($this->item->type) ?>
<?php echo MolajoText::_($this->item->type) ?>
</td>
<td class="center">
<?php echo $this->item->version ?>
</td>
<td class="center"><?php echo @$this->item->folder != '' ? $this->item->folder : 'N/A'; ?></td>
<td class="center"><?php echo @$this->item->application != '' ? JText::_($this->item->application) : 'N/A'; ?></td>
<td class="center"><?php echo @$this->item->application != '' ? MolajoText::_($this->item->application) : 'N/A'; ?></td>
<td>
<?php echo $this->item->detailsurl ?>
</td>
6 administrator/components/com_installer/views/warnings/tmpl/default.php
View file
@@ -15,15 +15,15 @@
<?php

if (!count($this->messages)) {
echo '<p class="nowarning">'. JText::_('COM_INSTALLER_MSG_WARNINGS_NONE').'</p>';
echo '<p class="nowarning">'. MolajoText::_('COM_INSTALLER_MSG_WARNINGS_NONE').'</p>';
} else {
echo JHtml::_('sliders.start', 'warning-sliders', array('useCookie'=>1));
foreach($this->messages as $message) {
echo JHtml::_('sliders.panel', $message['message'], str_replace(' ','', $message['message']));
echo '<div style="padding: 5px;" >'.$message['description'].'</div>';
}
echo JHtml::_('sliders.panel', JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'),'furtherinfo-pane');
echo '<div style="padding: 5px;" >'. JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC') .'</div>';
echo JHtml::_('sliders.panel', MolajoText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'),'furtherinfo-pane');
echo '<div style="padding: 5px;" >'. MolajoText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC') .'</div>';
echo JHtml::_('sliders.end');
}
?>
2 administrator/components/com_languages/controller.php
View file
@@ -50,7 +50,7 @@ public function display($cachable = false, $urlparams = false)
if ($view == 'language' && $layout == 'edit' && !$this->checkEditId('com_languages.edit.language', $id)) {

// Somehow the person just went to the form - we don't allow that.
$this->setError(JText::sprintf('MOLAJO_APPLICATION_ERROR_UNHELD_ID', $id));
$this->setError(MolajoText::sprintf('MOLAJO_APPLICATION_ERROR_UNHELD_ID', $id));
$this->setMessage($this->getError(), 'error');
$this->setRedirect(MolajoRoute::_('index.php?option=com_languages&view=languages', false));

4 administrator/components/com_languages/controllers/installed.php
View file
@@ -23,12 +23,12 @@ class LanguagesControllerInstalled extends JController
function setDefault()
{
// Check for request forgeries
JRequest::checkToken() or jexit(JText::_('JInvalid_Token'));
JRequest::checkToken() or jexit(MolajoText::_('JInvalid_Token'));
$cid = JRequest::getCmd('cid', '');
$model = $this->getModel('installed');
if ($model->publish($cid))
{
$msg = JText::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
$msg = MolajoText::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
$type = 'message';
}
else
6 administrator/components/com_languages/helpers/html/languages.php
View file
@@ -26,7 +26,7 @@ abstract class JHtmlLanguages {
public static function published($published)
{
if ($published) {
return JHtml::_('image','menu/icon-16-default.png', JText::_('COM_LANGUAGES_HEADING_DEFAULT'), NULL, true);
return JHtml::_('image','menu/icon-16-default.png', MolajoText::_('COM_LANGUAGES_HEADING_DEFAULT'), NULL, true);
}
else {
return '&#160;';
@@ -49,8 +49,8 @@ public static function id($rowNum,$language)
public static function applications()
{
return array(
JHtml::_('select.option', 0, JText::_('JSITE')),
JHtml::_('select.option', 1, JText::_('JADMINISTRATOR'))
JHtml::_('select.option', 0, MolajoText::_('JSITE')),
JHtml::_('select.option', 1, MolajoText::_('JADMINISTRATOR'))
);
}

6 administrator/components/com_languages/helpers/languages.php
View file
@@ -25,17 +25,17 @@ class LanguagesHelper
public static function addSubmenu($vName)
{
JSubMenuHelper::addEntry(
JText::_('COM_LANGUAGES_SUBMENU_INSTALLED_SITE'),
MolajoText::_('COM_LANGUAGES_SUBMENU_INSTALLED_SITE'),
'index.php?option=com_languages&view=installed&application=0',
$vName == 'installed'
);
JSubMenuHelper::addEntry(
JText::_('COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR'),
MolajoText::_('COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR'),
'index.php?option=com_languages&view=installed&application=1',
$vName == 'installed'
);
JSubMenuHelper::addEntry(
JText::_('COM_LANGUAGES_SUBMENU_CONTENT'),
MolajoText::_('COM_LANGUAGES_SUBMENU_CONTENT'),
'index.php?option=com_languages&view=languages',
$vName == 'languages'
);
2 administrator/components/com_languages/languages.php
View file
@@ -12,7 +12,7 @@

// Access check.
if (!MolajoFactory::getUser()->authorise('core.manage', 'com_languages')) {
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
return JError::raiseWarning(404, MolajoText::_('JERROR_ALERTNOAUTHOR'));
}

// Include dependancies
2 administrator/components/com_languages/models/installed.php
View file
@@ -311,7 +311,7 @@ public function publish($cid)
}
}
else {
$this->setError(JText::_('COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED'));
$this->setError(MolajoText::_('COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED'));
return false;
}

18 administrator/components/com_languages/views/installed/tmpl/default.php
View file
@@ -13,7 +13,7 @@
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
$user = MolajoFactory::getUser();
$userId = $user->get('id');
$application = $this->state->get('filter.application_id', 0) ? JText::_('JADMINISTRATOR') : JText::_('JSITE');
$application = $this->state->get('filter.application_id', 0) ? MolajoText::_('JADMINISTRATOR') : MolajoText::_('JSITE');
$applicationId = $this->state->get('filter.application_id', 0);
?>
<form action="<?php echo MolajoRoute::_('index.php?option=com_languages&view=installed&application='.$applicationId); ?>" method="post" id="adminForm" name="adminForm">
@@ -26,31 +26,31 @@
<thead>
<tr>
<th width="20">
<?php echo JText::_('COM_LANGUAGES_HEADING_NUM'); ?>
<?php echo MolajoText::_('COM_LANGUAGES_HEADING_NUM'); ?>
</th>
<th width="20">
&#160;
</th>
<th width="25%" class="title">
<?php echo JText::_('COM_LANGUAGES_HEADING_LANGUAGE'); ?>
<?php echo MolajoText::_('COM_LANGUAGES_HEADING_LANGUAGE'); ?>
</th>
<th>
<?php echo JText::_('JCLIENT'); ?>
<?php echo MolajoText::_('JCLIENT'); ?>
</th>
<th>
<?php echo JText::_('COM_LANGUAGES_HEADING_DEFAULT'); ?>
<?php echo MolajoText::_('COM_LANGUAGES_HEADING_DEFAULT'); ?>
</th>
<th>
<?php echo JText::_('MOLAJOVERSION'); ?>
<?php echo MolajoText::_('MOLAJOVERSION'); ?>
</th>
<th>
<?php echo JText::_('JDATE'); ?>
<?php echo MolajoText::_('JDATE'); ?>
</th>
<th>
<?php echo JText::_('JAUTHOR'); ?>
<?php echo MolajoText::_('JAUTHOR'); ?>
</th>
<th>
<?php echo JText::_('COM_LANGUAGES_HEADING_AUTHOR_EMAIL'); ?>
<?php echo MolajoText::_('COM_LANGUAGES_HEADING_AUTHOR_EMAIL'); ?>
</th>
</tr>
</thead>
12 administrator/components/com_languages/views/installed/tmpl/default_ftp.php
View file
@@ -9,28 +9,28 @@

defined('_JEXEC') or die;
?>
<fieldset title="<?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?>">
<legend><?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?></legend>
<fieldset title="<?php echo MolajoText::_('COM_LANGUAGES_FTP_TITLE'); ?>">
<legend><?php echo MolajoText::_('COM_LANGUAGES_FTP_TITLE'); ?></legend>

<?php echo JText::_('COM_LANGUAGES_FTP_DESC'); ?>
<?php echo MolajoText::_('COM_LANGUAGES_FTP_DESC'); ?>

<?php if (JError::isError($ftp)): ?>
<p class="warning"><?php echo JText::_($ftp->message); ?></p>
<p class="warning"><?php echo MolajoText::_($ftp->message); ?></p>
<?php endif; ?>

<table class="adminform">
<tbody>
<tr>
<td width="120">
<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
<label for="username"><?php echo MolajoText::_('JGLOBAL_USERNAME'); ?></label>
</td>
<td>
<input type="text" id="username" name="username" class="inputbox" size="70" value="" />
</td>
</tr>
<tr>
<td width="120">
<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
<label for="password"><?php echo MolajoText::_('JGLOBAL_PASSWORD'); ?></label>
</td>
<td>
<input type="password" id="password" name="password" class="inputbox" size="70" value="" />
6 administrator/components/com_languages/views/installed/tmpl/default_navigation.php
View file
@@ -16,11 +16,11 @@
<div class="submenu-pad">
<ul id="submenu" class="languages">
<li><a href="index.php?option=com_languages&view=installed&application=0" class="<?php echo ($application == "0") ? 'active' : '';?>">
<?php echo JText::_('COM_LANGUAGES_SUBMENU_INSTALLED_SITE'); ?></a></li>
<?php echo MolajoText::_('COM_LANGUAGES_SUBMENU_INSTALLED_SITE'); ?></a></li>
<li><a href="index.php?option=com_languages&view=installed&application=1" class="<?php echo ($application == "1") ? 'active' : '';?>">
<?php echo JText::_('COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR'); ?></a></li>
<?php echo MolajoText::_('COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR'); ?></a></li>
<li><a href="index.php?option=com_languages&view=languages">
<?php echo JText::_('COM_LANGUAGES_SUBMENU_CONTENT'); ?></a></li>
<?php echo MolajoText::_('COM_LANGUAGES_SUBMENU_CONTENT'); ?></a></li>
</ul>
<div class="clr"></div>
</div>
2 administrator/components/com_languages/views/installed/view.html.php
View file
@@ -78,7 +78,7 @@ protected function addToolbar()

$canDo = LanguagesHelper::getActions();

MolajoToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_TITLE'), 'langmanager.png');
MolajoToolbarHelper::title(MolajoText::_('COM_LANGUAGES_VIEW_INSTALLED_TITLE'), 'langmanager.png');

if ($canDo->get('core.edit.state')) {
MolajoToolbarHelper::makeDefault('installed.setDefault');
6 administrator/components/com_languages/views/language/tmpl/edit.php
View file
@@ -28,9 +28,9 @@
<div class="width-60 fltlft">
<fieldset class="adminform">
<?php if ($this->item->lang_id) : ?>
<legend><?php echo JText::sprintf('JGLOBAL_RECORD_NUMBER', $this->item->lang_id); ?></legend>
<legend><?php echo MolajoText::sprintf('JGLOBAL_RECORD_NUMBER', $this->item->lang_id); ?></legend>
<?php else : ?>
<legend><?php echo JText::_('COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE'); ?></legend>
<legend><?php echo MolajoText::_('COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE'); ?></legend>
<?php endif; ?>

<?php echo $this->form->getLabel('title'); ?>
@@ -63,7 +63,7 @@
<div class="width-40 fltrt">
<?php echo JHtml::_('sliders.start','language-sliders-'.$this->item->lang_code, array('useCookie'=>1)); ?>

<?php echo JHtml::_('sliders.panel',JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'metadata'); ?>
<?php echo JHtml::_('sliders.panel',MolajoText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'metadata'); ?>
<fieldset class="adminform">
<?php foreach($this->form->getFieldset('metadata') as $field): ?>
<?php if (!$field->hidden): ?>
2 administrator/components/com_languages/views/language/view.html.php
View file
@@ -55,7 +55,7 @@ protected function addToolbar()
$isNew = empty($this->item->lang_id);
$canDo = LanguagesHelper::getActions();

MolajoToolbarHelper::title(JText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'langmanager.png');
MolajoToolbarHelper::title(MolajoText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'langmanager.png');

// If a new item, can save.
if ($isNew && $canDo->get('core.create')) {