Commit Graph

95 Commits

Author SHA1 Message Date
Daniel Hensby
91444b8016
Merge branch '3' 2016-09-07 11:28:05 +01:00
Damian Mooyman
9f86315330 Update translations 2016-08-15 15:49:50 +12:00
Damian Mooyman
afc9bb0dc6 Merge 3.3 into 3.4
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml
2016-08-05 16:46:35 +12:00
Damian Mooyman
c449ad3f18 Update translations 2016-08-05 13:03:00 +12:00
Damian Mooyman
795ece3352 Merge 3.1 into 3.2
# Conflicts:
#	javascript/lang/fa_IR.js
#	javascript/lang/ru.js
#	javascript/lang/src/fa_IR.js
#	javascript/lang/src/ru.js
#	lang/fa_IR.yml
2016-08-05 11:37:29 +12:00
Damian Mooyman
6477e24219 Update translations 2016-08-05 11:06:51 +12:00
Damian Mooyman
ff07a2e264 API Convert CMS forms to bootstrap
API Update to cms-forms theme

This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
2016-07-25 17:25:22 +12:00
Daniel Hensby
a3d7d986a7
Merge branch '3' 2016-06-13 14:38:08 +01:00
Damian Mooyman
1ea9444be9 Update translations 2016-06-02 17:07:41 +12:00
Damian Mooyman
f5b00786d6 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
7d9ca4fac5 Merge 3.3 into 3
# Conflicts:
#	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/fa_IR.js
#	javascript/lang/src/fr.js
#	javascript/lang/src/hu.js
#	javascript/lang/src/id.js
#	javascript/lang/src/is.js
#	javascript/lang/src/it.js
#	javascript/lang/src/ja.js
#	javascript/lang/src/ko.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/ro.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_RS@latin.js
#	javascript/lang/src/sv.js
#	javascript/lang/src/zh.js
2016-05-11 14:03:59 +12:00
Damian Mooyman
4571779213 Update translations 2016-05-11 11:05:57 +12:00
Damian Mooyman
dd0163ae00 Update translations 2016-05-11 11:05:37 +12:00
Damian Mooyman
03c628345b Update translations 2016-05-11 10:58:24 +12:00
Ingo Schommer
e4861bdc79 Adjust file paths for new static file structure in framework 2016-04-20 21:13:20 +12:00
Damian Mooyman
33bf5f9519 Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman
42cedb70b9 Update translations 2016-02-19 10:21:02 +13:00
Damian Mooyman
93acf4b39a Update translations 2016-01-21 14:22:35 +13:00
Damian Mooyman
c3e82a4838 Merge remote-tracking branch 'origin/3.3' into 3
# Conflicts:
#	javascript/lang/src/fi.js
2016-01-19 17:10:41 +13:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Damian Mooyman
d387d4f311 Update translations 2015-12-23 13:22:38 +13:00
Damian Mooyman
73377a7a92 Update translations 2015-11-11 17:06:44 +13:00
Damian Mooyman
ebed1d22e5 Update translations 2015-11-11 16:07:20 +13:00
Damian Mooyman
d8915115f8 Update translations 2015-10-06 18:33:16 +13:00
Damian Mooyman
0df0f35278 Update translations 2015-09-18 14:21:19 +12:00
Damian Mooyman
353e5938de Update translations 2015-09-02 11:15:52 +12:00
Damian Mooyman
a3f789c2b5 Update translations 2015-08-24 16:29:40 +12:00
Damian Mooyman
a1b9e99342 Update localisation 2015-08-04 13:02:52 +12:00
scott1702
3566e4ed87 Update archive warning to include children pages 2015-08-03 16:10:10 +12:00
Damian Mooyman
12bcf382ad Update translations 2015-06-19 18:25:53 +12:00
Damian Mooyman
b169823a00 API Deprecate delete in favour of archive
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
2015-06-03 14:46:16 +12:00
Damian Mooyman
0557c0d47b Update translations 2015-05-14 13:52:21 +12:00
Damian Mooyman
c0a44db56b Merge pull request #1154 from uniun/missing-translations-entity
FIX. Missing translation entity
2015-03-10 22:50:26 +13:00
Damian Mooyman
c238e1e15b Update translations 2015-03-09 17:11:50 +13:00
Damian Mooyman
c7814cffc9 Update translations 2015-02-16 11:54:06 +13:00
Elvinas L.
9da7e90bf4 FIX. Missing translation entity
Missing translation entity on Update URL button.
2015-01-13 12:36:09 +02:00
Damian Mooyman
ee4639ed74 Update translations 2015-01-12 17:52:29 +13:00
Damian Mooyman
708e70624c Update translations 2014-11-08 17:06:10 +13:00
Damian Mooyman
407033b076 Update translations 2014-08-05 15:01:52 +12:00
Damian Mooyman
3033d45498 Updated translation masters 2014-05-13 11:13:44 +12:00
Damian Mooyman
bae95805dd Updated translation masters 2014-05-07 10:03:15 +12:00
Damian Mooyman
755f4f1557 Updated translation master 2014-03-31 14:23:47 +13:00
Ingo Schommer
ca37dc8e69 Updated translations 2014-02-18 11:50:04 +13:00
Ingo Schommer
6f5d9927de Updated translations 2013-12-19 18:05:19 +01:00
Ingo Schommer
b726180ab8 API JS i18n files with short locale names, generated by build task
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
2013-10-25 01:26:57 +02:00
Dawid Cieszyński
69ae8a8fed FIX Remove invalid single quote 2013-10-16 00:06:41 +02:00
Ingo Schommer
6a8de3090c Updated Te Reo translations 2013-10-08 11:37:43 +02:00
Ingo Schommer
26b086c3f7 Escape pl_PL.js (fixes #859) 2013-10-02 12:24:23 +02:00
ARNHOE
7305aca95b MINOR: added translation for children list and added tree translations 2013-04-10 10:54:09 +03:00
Simon Welsh
6482eeb137 Update pl_PL.js 2013-04-08 21:32:05 +12:00