Merge pull request #1789 from milamberspace/L10N-update-Master-20161124

Update L10N files from Transifex (2016-11-27) for the new release 4.10.0.0I've check manually the correct display of the UI foreach language.

Don't forget to merge this before 4.10 release.

cc @jburwell @rhtyd

* pr/1789:
  CLOUDSTACK-9621: Update L10N resource files with 4.10 strings from Transifex (20161127)
  CLOUDSTACK-9621: Improve conversion Transifex's JSON format to CloudStack JS

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

tools/transifex/sync-transifex-ui.sh

@@ -77,7 +77,12 @@ doDownloadL10NLangs()
         # l10n languages
         for CODELANG in ${LIST_LANG} ; do
                 if [ -f "${WORKDIR}/${CODELANG}.json" ]; then
-                        sed -e '1s/^/var dictionary = /' -e "\$s/\}$/\};/" -e "1s~^~${AL2_STRING}~" ${WORKDIR}/${CODELANG}.json > ${DIRECTORY_RESOURCES}/${CODELANG}.js
+                        sed -e 's/":"/": "/' \
+                                -e 's/^/    /g' \
+                                -e '1s/^    {/var dictionary = {\n    /' \
+                                -e '$s/\}$/\n\};/' \
+                                -e "1s~^~${AL2_STRING}~" \
+                                ${WORKDIR}/${CODELANG}.json > ${DIRECTORY_RESOURCES}/${CODELANG}.js
                 else   
                         echo "Warning: the resource file for language ${CODELANG} doesn't exist on transifex"
                 fi
@@ -102,7 +107,12 @@ doDownloadSourceLang()
         tx pull -s -r ${ARGUMENTS} 
         # Source language
         if [ -f "${WORKDIR}/${SRCLANG}.json" ]; then
-                sed -e '1s/^/var dictionary = /' -e "\$s/\}$/\};/" -e "1s~^~${AL2_STRING}~" ${WORKDIR}/${SRCLANG}.json > ${DIRECTORY_RESOURCES}/${SRCLANG}.js
+                sed -e 's/":"/": "/' \
+                        -e 's/^/    /g' \
+                        -e '1s/^    {/var dictionary = {\n    /' \
+                        -e '$s/\}$/\n\};/' \
+                        -e "1s~^~${AL2_STRING}~" \
+                        ${WORKDIR}/${SRCLANG}.json > ${DIRECTORY_RESOURCES}/${SRCLANG}.js
         else
                 echo "Warning: the source language hasn't been retrieve!"
         fi