From 3b9e2659b0f6043246036f237f1227bcf1e10e51 Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 2 Jul 2014 12:43:29 +0000 Subject: i18n for the new HTML5 upload (use i18n files from plupload) optional specific $lang_info[jquery_code] and $lang_info[plupload_code] to load the right i18n file git-svn-id: http://piwigo.org/svn/trunk@28917 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/include/datepicker.inc.tpl | 12 ++++++------ admin/themes/default/template/photos_add_direct.tpl | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'admin') diff --git a/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl index 87db85390..5bea0f8ff 100644 --- a/admin/themes/default/template/include/datepicker.inc.tpl +++ b/admin/themes/default/template/include/datepicker.inc.tpl @@ -2,16 +2,16 @@ {combine_script id='jquery.ui.timepicker-addon' load=$load_mode require='jquery.ui.datepicker,jquery.ui.slider' path="themes/default/js/ui/jquery.ui.timepicker-addon.js"} {$require='jquery.ui.timepicker-addon'} -{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"} +{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.jquery_code`.js"} {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists} -{combine_script id="jquery.ui.datepicker-`$lang_info.code`" load=$load_mode require='jquery.ui.datepicker' path=$datepicker_language} -{$require=$require|cat:",jquery.ui.datepicker-`$lang_info.code`"} +{combine_script id="jquery.ui.datepicker-`$lang_info.jquery_code`" load=$load_mode require='jquery.ui.datepicker' path=$datepicker_language} +{$require=$require|cat:",jquery.ui.datepicker-`$lang_info.jquery_code`"} {/if} -{assign var="timepicker_language" value="themes/default/js/ui/i18n/jquery.ui.timepicker-`$lang_info.code`.js"} +{assign var="timepicker_language" value="themes/default/js/ui/i18n/jquery.ui.timepicker-`$lang_info.jquery_code`.js"} {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists} -{combine_script id="jquery.ui.timepicker-`$lang_info.code`" load=$load_mode require='jquery.ui.timepicker-addon' path=$timepicker_language} -{$require=$require|cat:",jquery.ui.timepicker-`$lang_info.code`"} +{combine_script id="jquery.ui.timepicker-`$lang_info.jquery_code`" load=$load_mode require='jquery.ui.timepicker-addon' path=$timepicker_language} +{$require=$require|cat:",jquery.ui.timepicker-`$lang_info.jquery_code`"} {/if} {combine_script id='datepicker' load=$load_mode require=$require path='admin/themes/default/js/datepicker.js'} diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index 17f44285d..a85e67d13 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -7,6 +7,11 @@ {combine_css path="themes/default/js/plugins/jquery.jgrowl.css"} {combine_css path="themes/default/js/plugins/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css"} +{assign var="plupload_i18n" value="themes/default/js/plugins/plupload/i18n/`$lang_info.plupload_code`.js"} +{if "PHPWG_ROOT_PATH"|@constant|@cat:$plupload_i18n|@file_exists} + {combine_script id="plupload_i18n-`$lang_info.plupload_code`" load="footer" path=$plupload_i18n require="jquery.plupload.queue"} +{/if} + {include file='include/colorbox.inc.tpl'} {include file='include/add_album.inc.tpl'} -- cgit v1.2.3