joomla/Component-Builder
39
25
Fork 12
Code Issues 78 Pull Requests 1 Projects 4 Wiki Activity

Improved the import feature to insure that we don't have language conflicts with multiple strings for one language.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-04-08 14:44:41 +01:00
parent 1cf259a54d
commit 6bba258fec
203 changed files with 226 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/models/ajax.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage ajax.php

2
admin/models/componentbuilder.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

2
admin/models/fields/adminviewfolderlist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviewfolderlist.php

2
admin/models/fields/adminviews.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php

2
admin/models/fields/articles.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage articles.php

2
admin/models/fields/component.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage component.php

2
admin/models/fields/components.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage components.php

2
admin/models/fields/customadminviews.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php

2
admin/models/fields/customfilelist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php

2
admin/models/fields/customfolderlist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php

2
admin/models/fields/customgets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php

2
admin/models/fields/dbtables.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php

2
admin/models/fields/dynamicget.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicget.php

2
admin/models/fields/dynamicgets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php

2
admin/models/fields/fields.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

2
admin/models/fields/fieldsmulti.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldsmulti.php

2
admin/models/fields/fieldtypes.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

2
admin/models/fields/lang.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage lang.php

2
admin/models/fields/maingets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php

2
admin/models/fields/siteviewfolderlist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviewfolderlist.php

2
admin/models/fields/siteviews.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php

2
admin/models/fields/snippets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

4
admin/models/forms/joomla_component.js
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 329 of this MVC
@build 6th April, 2017
@version @update number 330 of this MVC
@build 8th April, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.js

2
admin/models/import.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage import.php

5
admin/models/import_joomla_components.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.4.2
@build 7th April, 2017
@build 8th April, 2017
@created 30th April, 2015
@package Component Builder
@subpackage import_joomla_components.php
@ -1495,7 +1495,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
$localTranslations = json_decode($item->localTranslation, true);
foreach ($localTranslations['translation'] as $nr => $value)
{
if (!in_array($value, $translations['translation']))
// only keep old translation if the new does not have this translation & language
if (!in_array($value, $translations['translation']) && !in_array($localTranslations['language'][$nr], $translations['language']))
{
$translations['translation'][] = $value;
$translations['language'][] = $localTranslations['language'][$nr];

4
admin/models/joomla_component.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 329 of this MVC
@build 6th April, 2017
@version @update number 330 of this MVC
@build 8th April, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.php

4
admin/models/joomla_components.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 329 of this MVC
@build 6th April, 2017
@version @update number 330 of this MVC
@build 8th April, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_components.php