Commit Graph

426 Commits

Author SHA1 Message Date
Aaron Carlino c99ed2d262 Reorganise i18n keys 2017-05-08 23:34:39 +12:00
Aaron Carlino 7c67d29484 Update translations 2017-05-02 10:46:54 +12:00
Damian Mooyman 8dd3f4ce1d Fix template localisation namespaces (#6852) 2017-05-01 08:28:24 +12:00
Damian Mooyman 82dd157741
Remove empty localisations 2017-04-28 15:09:36 +12:00
Damian Mooyman 2fa7598261 Shift hierarchy namespace i18n key 2017-04-28 14:59:42 +12:00
Damian Mooyman 23710cf23e Run upgrader 2017-04-28 14:59:42 +12:00
Damian Mooyman 7b4b133ad8 Remove unused keys (textcollector with merge=0) 2017-04-28 14:59:42 +12:00
Damian Mooyman fce38e0f5b Revert yml files to transifex 2017-04-28 14:59:42 +12:00
Aaron Carlino 7b7b3810e6 Merge permission translations back in 2017-04-28 14:59:42 +12:00
Aaron Carlino 20985bc484 alphabetise keys 2017-04-28 14:59:42 +12:00
Uncle Cheese d51c4891e2 New namespaced i18n keys 2017-04-28 14:59:42 +12:00
Uncle Cheese 494cbd1875 Ran upgrader for lang files 2017-04-28 14:59:42 +12:00
Ingo Schommer d2132e85db More specific localisations 2017-04-26 22:45:07 +12:00
Damian Mooyman 25c0efea26 Update translations 2017-04-05 16:08:16 +12:00
Saophalkun Ponlu 230e831e4b Translation for add to compaing form 2017-04-04 11:43:40 +12:00
Damian Mooyman 12d10df57a Update translations 2017-03-01 14:08:50 +13:00
Taras Yemtsov aa176ef84b Small translation misprint fix. 2017-02-25 16:45:50 +03:00
Daniel Hensby 7156da6279
Merge branch '3' 2017-02-20 22:19:33 +00:00
Dan Hensby 4d48548d89 Update translations 2017-02-20 17:01:16 +00:00
Daniel Hensby 71383b827d
Merge branch '3' 2017-02-08 12:34:45 +00:00
Damian Mooyman 9c040e10c4 Update translations 2017-02-08 11:05:29 +13:00
Dan Hensby 2e61655715 Update translations 2017-01-31 12:07:13 +00:00
Dan Hensby 247ddd5d46 Update translations 2017-01-26 21:47:36 +00:00
Damian Mooyman de02a3f733
Restored context parameter to i18n, and added to a “comment” key
Rolled pluralisation functionality into the i18n::_t() method
Warnings on missing default can now be turned off
2017-01-25 18:12:40 +13:00
Damian Mooyman 8a07c56bdf API Replace i18n message localisation with symfony/translation
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
2017-01-25 17:08:12 +13:00
Ingo Schommer 6bd7a6f00b Update translations 2017-01-17 17:07:42 +13:00
Ingo Schommer 85878192ff Update translations 2017-01-17 16:11:43 +13:00
Ingo Schommer b06e10c4a8 i18n for new template strings 2017-01-09 14:55:20 +13:00
Daniel Hensby 664c0eafbe
Merge branch '3' 2016-12-28 14:30:54 +00:00
Dan Hensby e57d7a30bd Update translations 2016-12-16 20:49:05 +00:00
Daniel Hensby ba39e552a2
Merge branch '3' 2016-12-15 12:20:29 +00:00
Damian Mooyman 2181e3b86b
BUG Fix localisation issues 2016-12-06 11:20:10 +13:00
Daniel Hensby c6d43b477e
Merge branch '3' 2016-11-29 13:27:49 +00:00
Daniel Hensby 1be2e70a2a
Merge branch '3' 2016-11-24 14:18:09 +00:00
Dan Hensby 50f456eed8 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby 662bc688e5 Update translations 2016-11-09 11:32:20 +00:00
Damian Mooyman ae037b68c6 Update translations 2016-11-03 14:53:52 +13:00
Christopher Joe d7ded0fb4a Add status flag to File and Image Edit Form
API extension hook "getIsModifiedOnStage" renamed to "updateIsModifiedOnStage", also moved "getIsDeletedFromStage", "getIsModifiedOnStage" and "getIsAddedToStage" from SiteTree class to Versioned data extension class
2016-10-06 10:30:52 +13:00
Damian Mooyman acc230fc99 Update translations 2016-09-23 16:14:42 +12:00
Chris Joe 08a39f5f93 Update file edit form (#6024)
* Added Created field to File/Image editor

* switch default input value to null

Fix react errors and added a field description

* API Use new DBField::getSchemaValue()
2016-09-20 12:56:45 +12:00
Dmitry Kudryavtsev 78276e5397 corrupt YML in italian translation (#5997) 2016-09-16 17:25:02 +12:00
Paul Clarke ea2fb1b325 Remove duplicated HTMLEditorField label variables, keep LINKTO label for language upgrade 2016-09-05 10:50:58 +12:00
Paul Clarke d7e756c4f2 Update labels with more appropriate text 2016-09-02 16:50:13 +12:00
Christopher Joe c1c20aaafc Breadcrumbs with new icons generated 2016-08-30 14:46:59 +12:00
Christopher Joe b77d21c25a Fix pages add to campaign, improved FormActions error handling, Popover focus highlight and refactored AddToCampaignModal to FormBuilderModal
tweaked tests to suit new generic FormBuilderModal, changed FormAction handler to throw a promise instead
2016-08-28 13:07:32 +12:00
Ingo Schommer 84cdb15a5f Simplify "add to campaign" dialog
Talked to @clarkepaul and simplified to avoid title duplication
2016-08-28 13:07:31 +12:00
Christopher Joe a9bdf33ca8 Fix SingleSelect styling, added add to campaign documentation 2016-08-28 13:07:31 +12:00
Daniel Hensby 1d1227cc9a
Merge branch '3' 2016-08-23 10:37:47 +01:00
Damian Mooyman f4ba3cd175 Merge 3.3 into 3.4
# Conflicts:
#	security/ChangePasswordForm.php
#	templates/forms/OptionsetField.ss
2016-08-15 19:03:13 +12:00
Damian Mooyman 87e789674f Update translations 2016-08-15 18:27:31 +12:00
Damian Mooyman b57fde6cff Update translations 2016-08-15 17:44:52 +12:00
Damian Mooyman 00d1d294ca Update translations 2016-08-15 15:49:50 +12:00
Damian Mooyman bf19806f50 Update translations 2016-08-15 15:00:58 +12:00
Damian Mooyman eb11c47d1c Update translations 2016-08-05 17:57:46 +12:00
Damian Mooyman ca754eb887 Merge 3.3 into 3.4
# Conflicts:
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/it.js
#	lang/cs.yml
#	lang/eo.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/it.yml
#	lang/sk.yml
2016-08-05 16:48:26 +12:00
Damian Mooyman 0d5ae23f2b Merge 3.2 into 3.3 2016-08-05 14:36:35 +12:00
Damian Mooyman cb39f2ef27 Merge 3.1 into 3.2
# Conflicts:
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	javascript/lang/fa_IR.js
#	javascript/lang/src/fa_IR.js
2016-08-05 11:41:04 +12:00
Damian Mooyman 9805544cee Update translations 2016-08-05 11:06:51 +12:00
Paul Clarke b9445511b7 Bootstrap GridField 2016-08-03 18:35:18 +12:00
Chris Joe dfe375e87e Fix MemberDatetime helper description, and shifted them to templates (#5766)
* Fix MemberDatetime helper description, and shifted them to templates

* added descriptionTemplate for setting the description

* Unit test for description with templates
2016-07-06 09:16:27 +01:00
Damian Mooyman ff3b970b71 Update translations 2016-06-02 17:07:41 +12:00
Daniel Hensby cdb0b07345
Merge branch '3' 2016-05-20 14:20:33 +01:00
Damian Mooyman d125d4e304 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman 19daf8f974 Update translations 2016-05-12 15:37:09 +12:00
Damian Mooyman 4f06a43986 Merge 3.3 into 3
# Conflicts:
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/en.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	javascript/lang/fr.js
#	javascript/lang/src/ar.js
#	javascript/lang/src/cs.js
#	javascript/lang/src/de.js
#	javascript/lang/src/en.js
#	javascript/lang/src/eo.js
#	javascript/lang/src/es.js
#	javascript/lang/src/fi.js
#	javascript/lang/src/fr.js
#	javascript/lang/src/id.js
#	javascript/lang/src/id_ID.js
#	javascript/lang/src/it.js
#	javascript/lang/src/ja.js
#	javascript/lang/src/lt.js
#	javascript/lang/src/mi.js
#	javascript/lang/src/nb.js
#	javascript/lang/src/nl.js
#	javascript/lang/src/pl.js
#	javascript/lang/src/ru.js
#	javascript/lang/src/sk.js
#	javascript/lang/src/sl.js
#	javascript/lang/src/sr.js
#	javascript/lang/src/sr@latin.js
#	javascript/lang/src/sr_RS.js
#	javascript/lang/src/sr_RS@latin.js
#	javascript/lang/src/sv.js
#	javascript/lang/src/zh.js
#	lang/it.yml
2016-05-11 14:06:23 +12:00
Damian Mooyman f4c2a89d5a Update translations 2016-05-11 11:05:57 +12:00
Damian Mooyman c27cb2dae7 Update translations 2016-05-11 11:05:37 +12:00
Damian Mooyman 60644a5be8 Update translations 2016-05-11 10:58:25 +12:00
Frank Mullenger b4cd617ee3 FIX: Renaming to HTMLEditorConfig.
FIX: Renaming to HTMLEditorField*.

FIX: Renaming to HTMLEditorSanitiser*.
2016-05-06 14:16:34 +12:00
Daniel Hensby 840cd4f877
Update translations 2016-05-05 12:46:38 +01:00
Daniel Hensby d1751e3310
Merge remote-tracking branch '3.2.4' into 3.3.2 2016-05-05 12:33:21 +01:00
Daniel Hensby 2edef65d7a
Update translations 2016-05-05 11:18:02 +01:00
Daniel Hensby cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4 2016-05-05 11:17:45 +01:00
Daniel Hensby 686db04a0a
Update translations 2016-05-05 02:05:54 +01:00
Damian Mooyman d52db0ba34 Merge 3 into master
# Conflicts:
#	.travis.yml
#	admin/css/ie7.css
#	admin/css/ie7.css.map
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.js
#	admin/scss/_style.scss
#	admin/scss/_uitheme.scss
#	control/HTTPRequest.php
#	core/Object.php
#	css/AssetUploadField.css
#	css/AssetUploadField.css.map
#	css/ConfirmedPasswordField.css.map
#	css/Form.css.map
#	css/GridField.css.map
#	css/TreeDropdownField.css.map
#	css/UploadField.css
#	css/UploadField.css.map
#	css/debug.css.map
#	dev/Debug.php
#	docs/en/00_Getting_Started/00_Server_Requirements.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
#	filesystem/File.php
#	filesystem/Folder.php
#	filesystem/GD.php
#	filesystem/Upload.php
#	forms/ToggleField.php
#	forms/Validator.php
#	javascript/lang/en_GB.js
#	javascript/lang/fr.js
#	javascript/lang/src/en.js
#	javascript/lang/src/fr.js
#	model/Image.php
#	model/UnsavedRelationList.php
#	model/Versioned.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/DBField.php
#	model/fieldtypes/Enum.php
#	scss/AssetUploadField.scss
#	scss/UploadField.scss
#	templates/email/ChangePasswordEmail.ss
#	templates/forms/DropdownField.ss
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
#	tests/forms/EnumFieldTest.php
#	tests/security/MemberTest.php
#	tests/security/MemberTest.yml
#	tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
Ingo Schommer c94802ea15 i18n for campaigns section 2016-04-26 15:32:09 +12:00
Ingo Schommer 7ba4b5b6ef Merge pull request #5241 from timkung/pulls/upload-validator-filesize-spelling
BUG changing all cases of filesize spelling to file size
2016-03-29 16:15:27 +13:00
Tim Kung 7907d20da7 BUG changing all cases of filesize spelling to file size 2016-03-29 13:38:24 +13:00
Ingo Schommer 3b11d73c46 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	forms/gridfield/GridFieldDetailForm.php
#	javascript/GridField.js
2016-03-07 09:26:35 +13:00
Ingo Schommer f36b110db3 Merge remote-tracking branch 'origin/3.3' 2016-03-04 17:06:04 +13:00
Petar Simic dcb83f0c6e Update it.yml - parse error on line 321 (323)
Error while building Italian version of framework. There is a wrong formatting in line 321 (ex. 323).
2016-02-29 18:28:07 +01:00
Damian Mooyman 393a4788bf Merge branch '3.2' into 3.3 2016-02-29 17:29:41 +13:00
Damian Mooyman f7d49df258 Merge tag '3.2.3' into 3.2
Release 3.2.3

# Conflicts:
#	lang/cs.yml
2016-02-29 17:27:00 +13:00
Damian Mooyman 24a6c53645 Merge branch '3.2' into 3.3
# Conflicts:
#	admin/code/ModelAdmin.php
#	lang/cs.yml
#	lang/lt.yml
#	lang/sk.yml
2016-02-29 17:03:22 +13:00
Damian Mooyman 4fbf0b0863 Merge remote-tracking branch 'origin/3.3.1' into 3.3 2016-02-29 17:01:26 +13:00
Damian Mooyman 2c1f837442 Merge branch '3.1' into 3.2
# Conflicts:
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
#	docs/en/02_Developer_Guides/00_Model/10_Versioning.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
#	docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/14_Files/index.md
#	lang/cs.yml
#	lang/fi.yml
#	lang/sk.yml
2016-02-29 16:59:20 +13:00
Damian Mooyman a20654b49b Update translations 2016-02-29 15:01:55 +13:00
Damian Mooyman 3f18b2f8cd Update translations 2016-02-29 15:01:10 +13:00
Damian Mooyman 31e04862a8 Update translations 2016-02-29 14:57:30 +13:00
Damian Mooyman 8a8d82cc57 Merge branch '3.3.1' into 3.3
# Conflicts:
#	lang/cs.yml
2016-02-27 21:19:29 +13:00
Damian Mooyman 80a6242912 Update translations 2016-02-27 21:01:57 +13:00
Damian Mooyman 6bbd50c917 Update translations 2016-02-27 21:00:46 +13:00
Damian Mooyman 387264fbbb Update translations 2016-02-27 20:53:15 +13:00
Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss
2016-02-25 14:51:59 +13:00
Damian Mooyman 5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
2016-02-24 17:29:06 +13:00
Damian Mooyman 301155b3e8 Update translations 2016-02-24 16:06:04 +13:00
Damian Mooyman 01c13bf6b3 Update translations 2016-02-24 15:20:40 +13:00
Damian Mooyman 50aab6d8d4 Update translations 2016-02-24 15:14:58 +13:00
Damian Mooyman 3738436d0e Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman cfd1a5d696 Update translations 2016-02-19 10:21:03 +13:00