From b2786c228b2384acab7ef99b6fce66e352895f15 Mon Sep 17 00:00:00 2001 From: Hamish Friedlander Date: Mon, 9 May 2016 15:28:24 +1200 Subject: [PATCH] FIX add_i18n_javascript calls not being updated after JS move This fixes alert / confirm boxes that were popping up without text (for example silverstripe-cms/issues/1476), although ideally we wouldn't show empty dialog boxes on this sort of error - we'd have some default, or a way to detect the issue. --- .tx/config | 8 ++++---- admin/code/LeftAndMain.php | 2 +- docs/en/04_Changelogs/4.0.0.md | 2 ++ forms/AssetField.php | 2 +- forms/TreeDropdownField.php | 2 +- forms/TreeMultiselectField.php | 2 +- forms/UploadField.php | 2 +- forms/gridfield/GridField.php | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.tx/config b/.tx/config index 23770d0d4..8f7d02340 100644 --- a/.tx/config +++ b/.tx/config @@ -8,13 +8,13 @@ source_lang = en type = YML [silverstripe-framework.master-js] -file_filter = javascript/lang/src/.js -source_file = javascript/lang/src/en.js +file_filter = client/lang/src/.js +source_file = client/lang/src/en.js source_lang = en type = KEYVALUEJSON [silverstripe-framework.master-admin-js] -file_filter = admin/javascript/lang/src/.js -source_file = admin/javascript/lang/src/en.js +file_filter = admin/client/lang/src/.js +source_file = admin/client/lang/src/en.js source_lang = en type = KEYVALUEJSON \ No newline at end of file diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 279a217c8..c4f247f1e 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -510,7 +510,7 @@ class LeftAndMain extends Controller implements PermissionProvider { ] ]); - Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang', false, true); + Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang', false, true); Requirements::add_i18n_javascript(FRAMEWORK_ADMIN_DIR . '/client/lang', false, true); if ($this->config()->session_keepalive_ping) { diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md index 2399897fb..7d6546ea1 100644 --- a/docs/en/04_Changelogs/4.0.0.md +++ b/docs/en/04_Changelogs/4.0.0.md @@ -133,11 +133,13 @@ Care should also be taken when referencing images in these folders from your own ``` framework/javascript => framework/client/dist/ +framework/javascript/lang => framework/client/lang/ framework/images => framework/client/dist/images/ framework/css => framework/client/dist/css/ framework/scss => framework/client/src/styles/ admin/javascript/ => admin/client/src/ admin/javascript/src/ => admin/client/src/legacy/ (mostly) +admin/javascript/lang/ => admin/client/lang/ admin/scss/ => admin/client/styles/legacy/ admin/css/ => admin/client/dist/css/ admin/css/screen.css => admin/client/dist/css/bundle.css diff --git a/forms/AssetField.php b/forms/AssetField.php index 970c1f97a..1c5e06556 100644 --- a/forms/AssetField.php +++ b/forms/AssetField.php @@ -493,7 +493,7 @@ class AssetField extends FileField { Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ssui.core.js'); - Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang'); + Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang'); Requirements::combine_files('uploadfield.js', array( // @todo jquery templates is a project no longer maintained and should be retired at some point. diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php index b81d5e91c..5b4e04ea2 100644 --- a/forms/TreeDropdownField.php +++ b/forms/TreeDropdownField.php @@ -207,7 +207,7 @@ class TreeDropdownField extends FormField { * @return HTMLText */ public function Field($properties = array()) { - Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang'); + Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js'); diff --git a/forms/TreeMultiselectField.php b/forms/TreeMultiselectField.php index 1263b52e1..5bff0bfa1 100644 --- a/forms/TreeMultiselectField.php +++ b/forms/TreeMultiselectField.php @@ -89,7 +89,7 @@ class TreeMultiselectField extends TreeDropdownField { * formfield can contain multiple values. */ public function Field($properties = array()) { - Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang'); + Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js'); diff --git a/forms/UploadField.php b/forms/UploadField.php index 9172115c0..fc4d5f313 100644 --- a/forms/UploadField.php +++ b/forms/UploadField.php @@ -928,7 +928,7 @@ class UploadField extends FileField { Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ssui.core.js'); - Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang'); + Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang'); Requirements::combine_files('uploadfield.js', array( // @todo jquery templates is a project no longer maintained and should be retired at some point. diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php index 1f075a6fa..c46ce5d0b 100644 --- a/forms/gridfield/GridField.php +++ b/forms/gridfield/GridField.php @@ -295,7 +295,7 @@ class GridField extends FormField { Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-ui/jquery-ui.js'); Requirements::javascript(FRAMEWORK_DIR . '/client/dist/js/i18n.js'); - Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang'); + Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(FRAMEWORK_DIR . '/client/dist/js/GridField.js');