joomla/Component-Builder
joomla
/
Component-Builder
38
19
Fork 11
Code Issues 53 Pull Requests Projects 3 Releases Wiki Activity

Easy Translation via excel #220

Merged
Llewellyn merged 5 commits from staging into master 2018-01-19 12:09:38 +00:00
Conversation 1 Commits 5 Files Changed 48 +12 -9
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 467a7aac95 - Show all commits

2
README.md
View File

@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.6.12
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **180462**
+ *Line count*: **180465**
+ *Field count*: **1573**
+ *File count*: **1160**
+ *Folder count*: **186**

2
admin/README.txt
View File

@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.6.12
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **180462**
+ *Line count*: **180465**
+ *Field count*: **1573**
+ *File count*: **1160**
+ *Folder count*: **186**

7
admin/models/language_translations.php
View File

@ -440,9 +440,12 @@ class ComponentbuilderModelLanguage_translations extends JModelList
$headers->id = 'id';
$headers->English = 'English';
// add the languages
foreach ($languages as $language)
if (ComponentbuilderHelper::checkArray($languages))
{
$headers->{$language} = $language;
foreach ($languages as $language)
{
$headers->{$language} = $language;
}
}
return $headers;
}

8
admin/views/componentbuilder/tmpl/default.php
View File

@ -91,12 +91,12 @@ JHtml::_('behavior.tooltip');
</div>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'vast_development_method', JText::_('Vast Development Method', true)); ?>
<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'notice_board', JText::_('Notice Board', true)); ?>
<div class="row-fluid">
<div class="span12">
<?php echo JHtml::_('bootstrap.startAccordion', 'vast_development_method_accordian', array('active' => 'vast_development_method_one')); ?>
<?php echo JHtml::_('bootstrap.addSlide', 'vast_development_method_accordian', 'Notice Board', 'vast_development_method_one'); ?>
<?php echo $this->loadTemplate('vast_development_method_notice_board');?>
<?php echo JHtml::_('bootstrap.startAccordion', 'notice_board_accordian', array('active' => 'notice_board_one')); ?>
<?php echo JHtml::_('bootstrap.addSlide', 'notice_board_accordian', 'Vast Development Method', 'notice_board_one'); ?>
<?php echo $this->loadTemplate('notice_board_vast_development_method');?>
<?php echo JHtml::_('bootstrap.endSlide'); ?>
<?php echo JHtml::_('bootstrap.endAccordion'); ?>
</div>

2
admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php → admin/views/componentbuilder/tmpl/default_notice_board_vast_development_method.php
View File

@ -13,7 +13,7 @@
@version 2.6.x
@created 30th April, 2015
@package Component Builder
@subpackage default_vast_development_method_notice_board.php
@subpackage default_notice_board_vast_development_method.php
@author Llewellyn van der Merwe <http://joomlacomponentbuilder.com>
@github Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
@copyright Copyright (C) 2015. All Rights Reserved