From 53cc13304d1455efd0a02c63945d6aa37c7246f9 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 26 Mar 2015 08:51:58 +0100
Subject: [PATCH 1/3] ini do not need no BOM since 1.6

---
 component/admin/models/translation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/component/admin/models/translation.php b/component/admin/models/translation.php
index 7bd906e1..f7bfaa31 100644
--- a/component/admin/models/translation.php
+++ b/component/admin/models/translation.php
@@ -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;

From 747a0d73cbddfe76580281d48a47e89510632d02 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 26 Mar 2015 09:52:51 +0100
Subject: [PATCH 2/3] Updating package creation to include uncompressed js when
 there is a custom calendar

---
 component/admin/models/package.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/component/admin/models/package.php b/component/admin/models/package.php
index 4bedccee..7de99af4 100644
--- a/component/admin/models/package.php
+++ b/component/admin/models/package.php
@@ -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))
@@ -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";
 			}
 

From 8cfd89caeb6c60f15e9f447cee378e98cb22b3a9 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Sat, 28 Mar 2015 11:00:14 +0100
Subject: [PATCH 3/3] Releasing version 4.0.12-dev

---
 localise.xml      | 2 +-
 update-server.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/localise.xml b/localise.xml
index 9996a226..1b6fd02f 100644
--- a/localise.xml
+++ b/localise.xml
@@ -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>
diff --git a/update-server.xml b/update-server.xml
index c918c4ba..bb8c5c99 100644
--- a/update-server.xml
+++ b/update-server.xml
@@ -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>