tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5475 from open-sausages/pulls/4.0/fix-add-i18n-javascript-locations

Browse Source 
FIX add_i18n_javascript calls not being updated after JS move
This commit is contained in:
Ingo Schommer 2016-05-09 15:55:54 +12:00
commit 88a2a35758
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.tx/config
View File

@ -8,13 +8,13 @@ source_lang = en
type = YML type = YML
[silverstripe-framework.master-js] [silverstripe-framework.master-js]
file_filter = javascript/lang/src/<lang>.js file_filter = client/lang/src/<lang>.js
source_file = javascript/lang/src/en.js source_file = client/lang/src/en.js
source_lang = en source_lang = en
type = KEYVALUEJSON type = KEYVALUEJSON
[silverstripe-framework.master-admin-js] [silverstripe-framework.master-admin-js]
file_filter = admin/javascript/lang/src/<lang>.js file_filter = admin/client/lang/src/<lang>.js
source_file = admin/javascript/lang/src/en.js source_file = admin/client/lang/src/en.js
source_lang = en source_lang = en
type = KEYVALUEJSON type = KEYVALUEJSON

2
admin/code/LeftAndMain.php
View File

@ -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); Requirements::add_i18n_javascript(FRAMEWORK_ADMIN_DIR . '/client/lang', false, true);
if ($this->config()->session_keepalive_ping) { if ($this->config()->session_keepalive_ping) {

2
docs/en/04_Changelogs/4.0.0.md
View File

@ -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 => framework/client/dist/
framework/javascript/lang => framework/client/lang/
framework/images => framework/client/dist/images/ framework/images => framework/client/dist/images/
framework/css => framework/client/dist/css/ framework/css => framework/client/dist/css/
framework/scss => framework/client/src/styles/ framework/scss => framework/client/src/styles/
admin/javascript/ => admin/client/src/ admin/javascript/ => admin/client/src/
admin/javascript/src/ => admin/client/src/legacy/ (mostly) admin/javascript/src/ => admin/client/src/legacy/ (mostly)
admin/javascript/lang/ => admin/client/lang/
admin/scss/ => admin/client/styles/legacy/ admin/scss/ => admin/client/styles/legacy/
admin/css/ => admin/client/dist/css/ admin/css/ => admin/client/dist/css/
admin/css/screen.css => admin/client/dist/css/bundle.css admin/css/screen.css => admin/client/dist/css/bundle.css

2
forms/AssetField.php
View File

@ -493,7 +493,7 @@ class AssetField extends FileField {
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js');
Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ssui.core.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( Requirements::combine_files('uploadfield.js', array(
// @todo jquery templates is a project no longer maintained and should be retired at some point. // @todo jquery templates is a project no longer maintained and should be retired at some point.

2
forms/TreeDropdownField.php
View File

@ -207,7 +207,7 @@ class TreeDropdownField extends FormField {
* @return HTMLText * @return HTMLText
*/ */
public function Field($properties = array()) { 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/jquery.js');
Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');

2
forms/TreeMultiselectField.php
View File

@ -89,7 +89,7 @@ class TreeMultiselectField extends TreeDropdownField {
* formfield can contain multiple values. * formfield can contain multiple values.
*/ */
public function Field($properties = array()) { 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/jquery.js');
Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');

2
forms/UploadField.php
View File

@ -928,7 +928,7 @@ class UploadField extends FileField {
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js');
Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ssui.core.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( Requirements::combine_files('uploadfield.js', array(
// @todo jquery templates is a project no longer maintained and should be retired at some point. // @todo jquery templates is a project no longer maintained and should be retired at some point.

2
forms/gridfield/GridField.php
View File

@ -295,7 +295,7 @@ class GridField extends FormField {
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-ui/jquery-ui.js'); Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-ui/jquery-ui.js');
Requirements::javascript(FRAMEWORK_DIR . '/client/dist/js/i18n.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(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js');
Requirements::javascript(FRAMEWORK_DIR . '/client/dist/js/GridField.js'); Requirements::javascript(FRAMEWORK_DIR . '/client/dist/js/GridField.js');