Resolved issue 0000893: 404 errors on template-common/lib/ui/i18n/ui.…

…datepicker-en.js Proposition of fix. Waiting validation before merge to branch 2.0 git-svn-id: http://piwigo.org/svn/trunk@2739 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Oct 14, 2008 · 87689c8 · 87689c8
1 parent 3be71cd
commit 87689c8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/admin/template/goto/include/datepicker.inc.tpl b/admin/template/goto/include/datepicker.inc.tpl
@@ -1,10 +1,22 @@
 {* $Id$ *}
+{php}
+  global $lang_info;
+
+  $filename = get_root_url()."template-common/lib/ui/i18n/ui.datepicker-".$lang_info['code'].".js";
+
+  $this->assign('exist_jquery_datepicker_lang', file_exists($filename));
+  $this->assign('filename_jquery_datepicker_lang', $filename);
+{/php}
+
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
 {known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.datepicker.packed.js"}
-{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:"template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
 {known_script id="datepicker.js" src=$ROOT_URL|@cat:"template-common/datepicker.js"}
 
+{if $exist_jquery_datepicker_lang}
+{known_script id="jquery.ui.datepicker-$lang_info.code" src=$filename_jquery_datepicker_lang}
+{/if}
+
 {html_head}
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}template-common/lib/ui/ui.datepicker.css">
 {/html_head}

diff --git a/template/yoga/include/datepicker.inc.tpl b/template/yoga/include/datepicker.inc.tpl
@@ -1,10 +1,22 @@
 {* $Id$ *}
+{php}
+  global $lang_info;
+
+  $filename = get_root_url()."template-common/lib/ui/i18n/ui.datepicker-".$lang_info['code'].".js";
+
+  $this->assign('exist_jquery_datepicker_lang', file_exists($filename));
+  $this->assign('filename_jquery_datepicker_lang', $filename);
+{/php}
+
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
 {known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.datepicker.packed.js"}
-{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:"template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
 {known_script id="datepicker.js" src=$ROOT_URL|@cat:"template-common/datepicker.js"}
 
+{if $exist_jquery_datepicker_lang}
+{known_script id="jquery.ui.datepicker-$lang_info.code" src=$filename_jquery_datepicker_lang}
+{/if}
+
 {html_head}
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}template-common/lib/ui/ui.datepicker.css">
 {/html_head}