Skip to content

Update from source #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Valc merged 3 commits into from
Apr 21, 2015
Merged

Update from source #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53cc133
ini do not need no BOM since 1.6
infograf768 Mar 26, 2015
747a0d7
Updating package creation to include uncompressed js when there is a
infograf768 Mar 26, 2015
8cfd89c
Releasing version 4.0.12-dev
infograf768 Mar 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions component/admin/models/package.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,19 @@ public function download($data)
$site_txt .= "\t\t" . '<filename>js/calendar-setup.js</filename>' . "\n";
}

$path = JPATH_ROOT . '/media/' . $data['language'] . '/js/calendar-setup-uncompressed.js';

if (JFile::exists($path))
{
$file_data = file_get_contents($path);
}

if (JFile::exists($path) && !empty($file_data))
{
$site_package_files[] = array('name' => 'js/calendar-setup-uncompressed.js','data' => $file_data);
$site_txt .= "\t\t" . '<filename>js/calendar-setup-uncompressed</filename>' . "\n";
}

$path = JPATH_ROOT . '/media/' . $data['language'] . '/js/index.html';

if (JFile::exists($path))
Expand All @@ -815,6 +828,19 @@ public function download($data)
$site_txt .= "\t\t" . '<filename>js/calendar.js</filename>' . "\n";
}

$path = JPATH_ROOT . '/media/' . $data['language'] . '/js/calendar-uncompressed.js';

if (JFile::exists($path))
{
$file_data = file_get_contents($path);
}

if (JFile::exists($path) && !empty($file_data))
{
$site_package_files[] = array('name' => 'js/calendar-uncompressed.js','data' => $file_data);
$site_txt .= "\t\t" . '<filename>js/calendar-uncompressed.js</filename>' . "\n";
}

$site_txt .= "\t" . '</media>' . "\n";
}

Expand Down
2 changes: 1 addition & 1 deletion component/admin/models/translation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ public function saveFile($data)
}

$contents2 .= "; @note Client " . ucfirst($client) . "\n";
$contents2 .= "; @note All ini files need to be saved as UTF-8 - No BOM\n\n";
$contents2 .= "; @note All ini files need to be saved as UTF-8\n\n";

$contents = array();
$stream = new JStream;
Expand Down
2 changes: 1 addition & 1 deletion localise.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<copyright>(C) 2015 Open Source Matters. All rights reserved.</copyright>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>https://github.com/joomla-projects/com_localise</authorUrl>
<version>4.0.11-dev</version>
<version>4.0.12-dev</version>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<description>COM_LOCALISE_XML_DESCRIPTION</description>
<scriptfile>install.php</scriptfile>
Expand Down
4 changes: 2 additions & 2 deletions update-server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<description>Localise - nice and easy management of languages and translation files.</description>
<element>com_localise</element>
<type>component</type>
<version>4.0.11-dev</version>
<version>4.0.12-dev</version>
<infourl title="com_localise">https://github.com/joomla-projects/com_localise/</infourl>
<downloads>
<downloadurl type="full" format="zip">https://github.com/joomla-projects/com_localise/releases/download/4.0.11-dev/com_localise-4.0.11-dev.zip</downloadurl>
<downloadurl type="full" format="zip">https://github.com/joomla-projects/com_localise/releases/download/4.0.12-dev/com_localise-4.0.12-dev.zip</downloadurl>
</downloads>
<targetplatform name="joomla" version=".*" />
</update>
Expand Down