From 0251a9aac9cae56d046de9637504fa9b77b2103c Mon Sep 17 00:00:00 2001
From: Lahmizzar Muinela <lahmizzar@devxive.com>
Date: Tue, 07 Jan 2014 17:04:55 -0500
Subject: [PATCH] Fix bug in building single language manifest files

---
 builder/buildManifest |   24 +++++++----
 builder/create        |    2 +
 builder/pull          |   68 +++++++++++++++++----------------
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/builder/buildManifest b/builder/buildManifest
index b95f249..b30c564 100755
--- a/builder/buildManifest
+++ b/builder/buildManifest
@@ -10,19 +10,16 @@
 # Simple script to build an appropriate language manifest
 #
 # How to use
-# ./buildManifest [Joomla Language String] [Transifex Language String]
+# ./buildManifest [Joomla Language String] [Transifex Language String] [Version]
 #
 # > ./buildManifest ru-RU
-
-sourcePath=$(realpath .)
-rootPath='$sourcePath/languages'
+#
+# as used in the pull script
+# $sourcePath/builder/buildManifest da-DK da_DK $version
+#
+# This script is invoked by the pull script to build the appropriate language manifest file
 
 # Settings
-filePrefix='lang_pf4_'
-
-# ver='4.2.0b4'
-ver="$3"
-creationDate=''
 name="Projectfork Language - $1"
 author='Projectfork Translation Team'
 authorEmail='support@projectfork.net'
@@ -30,9 +27,17 @@
 copyright='(C) 2012 - 2013 by the Projectfork Translation Team. All rights reserved.'
 
 # Advanced Settings
+filePrefix='lang_pf4_'
 installVer="2.5"
 
 ########## ------------------- DO NOT TOUCH BELOW ------------------- ##########
+sourcePath=$(realpath .)
+rootPath='$sourcePath/languages'
+
+# Example ver='4.2.0b4'
+ver="$3"
+creationDate=''
+
 # Set language string
 lang="$1"
 txLang="$2"
@@ -66,6 +71,7 @@
 echo "	<version>$ver</version>" >> "$newFile"
 echo "	<description>" >> "$newFile"
 echo "		<![CDATA[" >> "$newFile"
+# TODO: add a description var to the settings above
 echo "			The $lang language pack for Projectfork 4, a Project Management extension for Joomla!" >> "$newFile"
 echo "" >> "$newFile"
 echo "			<h6>Translation Credits:</h6>" >> "$newFile"
diff --git a/builder/create b/builder/create
index 59f4554..0532390 100755
--- a/builder/create
+++ b/builder/create
@@ -12,6 +12,8 @@
 # How to use
 # ./create update 4.2.0b4 2013-12-06 (Fetch Updates from transifex first, then create the install file)
 # ./create 4.2.0b4 2013-12-06 (Create the install file from the existing/current languages folder)
+#
+# This script is invoked by the build script, located in the root dir of this repo
 
 sourcePath=$(realpath .)
 
diff --git a/builder/pull b/builder/pull
index e1d485d..2091cd0 100755
--- a/builder/pull
+++ b/builder/pull
@@ -8,94 +8,96 @@
   ######################################
 
 # Simple script to pull tx translatons and build manifest files
-# To add a language, please have a look at the .tx/config file, if the language exists
+# This script is to take control about what language will be pulled and stored in the language pack
+# If you add a language, please have a look at the .tx/config file first and check if the language exists.
 #
-# How to use
-# > ./pull
+# This script is invoked by the create script
+
+sourcePath=$(realpath .)
 
 txClient="../../transifex-client/tx"
 version="$1"
 
 $txClient pull -l da_DK	# 100%
-./buildManifest da-DK da_DK $version
+$sourcePath/builder/buildManifest da-DK da_DK $version
 
 $txClient pull -l fr_FR	# 100%
-./buildManifest fr-FR fr_FR $version
+$sourcePath/builder/buildManifest fr-FR fr_FR $version
 
 $txClient pull -l de_DE	# 100%
-./buildManifest de-DE de_DE $version
+$sourcePath/builder/buildManifest de-DE de_DE $version
 
 $txClient pull -l hu_HU	# 100%
-./buildManifest hu-HU hu_HU $version
+$sourcePath/builder/buildManifest hu-HU hu_HU $version
 
 $txClient pull -l pt_BR	# 100%
-./buildManifest pt-BR pt_BR $version
+$sourcePath/builder/buildManifest pt-BR pt_BR $version
 
 $txClient pull -l es_ES	# 100%
-./buildManifest es-ES es_ES $version
+$sourcePath/builder/buildManifest es-ES es_ES $version
 
 $txClient pull -l tr_TR	# 100%
-./buildManifest tr-TR tr_TR $version
+$sourcePath/builder/buildManifest tr-TR tr_TR $version
 
 $txClient pull -l nb_NO	# 98%
-./buildManifest nb-NO nb_NO $version
+$sourcePath/builder/buildManifest nb-NO nb_NO $version
 
 $txClient pull -l pl_PL	# 98%
-./buildManifest pl-PL pl_PL $version
+$sourcePath/builder/buildManifest pl-PL pl_PL $version
 
 $txClient pull -l ca_ES	# 97%
-./buildManifest ca-ES ca_ES $version
+$sourcePath/builder/buildManifest ca-ES ca_ES $version
 
 $txClient pull -l zh_TW	# 97%
-./buildManifest zh-TW zh_TW $version
+$sourcePath/builder/buildManifest zh-TW zh_TW $version
 
 $txClient pull -l nl_NL	# 97%
-./buildManifest nl-NL nl_NL $version
+$sourcePath/builder/buildManifest nl-NL nl_NL $version
 
 $txClient pull -l it_IT	# 97%
-./buildManifest it-IT it_IT $version
+$sourcePath/builder/buildManifest it-IT it_IT $version
 
 $txClient pull -l ja_JP	# 97%
-./buildManifest ja-JP ja_JP $version
+$sourcePath/builder/buildManifest ja-JP ja_JP $version
 
 $txClient pull -l ro_RO	# 97%
-./buildManifest ro-RO ro_RO $version
+$sourcePath/builder/buildManifest ro-RO ro_RO $version
 
 $txClient pull -l th_TH	# 97%
-./buildManifest th-TH th_TH $version
+$sourcePath/builder/buildManifest th-TH th_TH $version
 
 $txClient pull -l ru_RU	# 95%
-./buildManifest ru-RU ru_RU $version
+$sourcePath/builder/buildManifest ru-RU ru_RU $version
 
 $txClient pull -l el_GR	# 94%
-./buildManifest el-GR el_GR $version
+$sourcePath/builder/buildManifest el-GR el_GR $version
 
 $txClient pull -l cs_CZ	# 93%
-./buildManifest cs-CZ cs_CZ $version
+$sourcePath/builder/buildManifest cs-CZ cs_CZ $version
 
 $txClient pull -l pt_PT	# 93%
-./buildManifest pt-PT pt_PT $version
+$sourcePath/builder/buildManifest pt-PT pt_PT $version
 
 $txClient pull -l sv_SE	# 90%
-./buildManifest sv-SE sv_SE $version
+$sourcePath/builder/buildManifest sv-SE sv_SE $version
 
 $txClient pull -l sk_SK	# 70%
-./buildManifest sk-SK sk_SK $version
+$sourcePath/builder/buildManifest sk-SK sk_SK $version
 
 $txClient pull -l uk_UA	# 56%
-./buildManifest uk-UA uk_UA $version
+$sourcePath/builder/buildManifest uk-UA uk_UA $version
 
 $txClient pull -l nl_BE	# 41%
-./buildManifest nl-BE nl_BE $version
+$sourcePath/builder/buildManifest nl-BE nl_BE $version
 
 $txClient pull -l bg_BG	# 34%
-./buildManifest bg-BG bg_BG $version
+$sourcePath/builder/buildManifest bg-BG bg_BG $version
+
+$txClient pull -l fa_IR	# 34%
+$sourcePath/builder/buildManifest fa-IR fa_IR $version
 
 $txClient pull -l es_MX	# 31%
-./buildManifest es-MX es_MX $version
+$sourcePath/builder/buildManifest es-MX es_MX $version
 
 $txClient pull -l ar_AA	# 23%
-./buildManifest ar-AA ar_AA $version
-
-$txClient pull -l fa_IR	# 14%
-./buildManifest fa-IR fa_IR $version
\ No newline at end of file
+$sourcePath/builder/buildManifest ar-AA ar_AA $version

--
Gitblit v1.9.1