Ingo Schommer
f29d51f433
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/reference/dataobject.md
lang/es.yml
2013-12-19 20:23:09 +01:00
Ingo Schommer
23371b01aa
"lost password" translation master ( fixes #2725 )
2013-12-19 20:00:59 +01:00
Ingo Schommer
ca0c56e203
Updated translation masters
...
Fixed two inconsistenties with missing namespaces in templates.
2013-12-19 19:51:25 +01:00
Ingo Schommer
ddcdb2c0f0
Updated translations
2013-12-19 18:04:37 +01:00
Andrew Short
bedf292612
Merge branch '3.1'
...
Conflicts:
docs/en/reference/execution-pipeline.md
lang/nl.yml
2013-11-11 18:18:25 +11:00
Ingo Schommer
65844e1f86
Updated translations
2013-11-08 00:58:24 +01:00
Ingo Schommer
25b6175e67
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/FormField.php
2013-10-20 13:52:56 +02:00
Will Rossiter
b0f38f4990
Change default message to be credential agnostic.
2013-10-11 11:22:15 +13:00
Ingo Schommer
ed1a9adae6
Updated translations
2013-10-10 12:33:55 +02:00
Ingo Schommer
8727d1b1eb
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:11:50 +02:00
Ingo Schommer
36d8a9f62d
Chinese translation encoding
2013-10-08 12:20:10 +02:00
Ingo Schommer
9288bdc5ea
Updated Te Reo translations
2013-10-08 11:37:11 +02:00
Ingo Schommer
6e8ec778c3
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
lang/en.yml
2013-10-07 16:19:40 +02:00
Ingo Schommer
e4c2d64877
Updated translations
2013-10-07 14:28:02 +02:00
Ingo Schommer
afc81fe7af
Updated translations
2013-10-07 01:18:00 +02:00
Ingo Schommer
dc7e2df20a
Corrected translation references in templates
...
Were using old entity naming scheme (*.ss) instead
of underscored version which doesn't create a new YML
namespace. This means all existing translations should indeed be used.
Was already fixed in master, but not in 3.1
2013-10-06 23:25:47 +02:00
Ingo Schommer
ba360497aa
Updated translations
2013-10-06 19:58:08 +02:00
Ingo Schommer
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
Ingo Schommer
487de0bf5a
Renamed "ja_JP" locale to "ja"
...
Better compat with transifex with generic locale
2013-10-06 19:06:07 +02:00
Ingo Schommer
98d676bfdc
Updated translations
2013-10-01 00:04:58 +02:00
Ingo Schommer
455e550d9a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/topics/testing/create-silverstripe-test.md
forms/Form.php
i18n/i18n.php
model/Image.php
2013-09-27 19:22:14 +02:00
Ingo Schommer
505db1f731
Updated translations
2013-09-12 16:53:32 +02:00
TeamCity
ec9f2e1284
Updated master strings
2013-08-23 02:36:17 +12:00
Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Ingo Schommer
fd2a0cd1f9
Updated translations
2013-08-09 15:33:01 +02:00
Ingo Schommer
6ee0d53f40
Fixed merge error (mainly new translation entity format in templates)
...
Merge error from 2a35f2f928
,
which was then further regressed by Sam running the text collector
on those faulty templates: 750b5b4079
2013-08-09 15:27:28 +02:00
Ingo Schommer
306ce7ab70
Updated translations
2013-08-09 12:52:09 +02:00
Sam Minnee
750b5b4079
Updated translation master file
2013-08-09 14:18:10 +12:00
Ingo Schommer
afe06661ef
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
admin/templates/Includes/ModelAdmin_ImportSpec.ss
admin/templates/Includes/ModelAdmin_Tools.ss
admin/templates/LeftAndMain.ss
admin/templates/ModelSidebar.ss
i18n/i18n.php
templates/ComplexTableField.ss
templates/ComplexTableField_popup.ss
templates/FileIFrameField_iframe.ss
templates/Includes/GridFieldItemEditView.ss
templates/Includes/TableListField_PageControls.ss
templates/RelationComplexTableField.ss
templates/TableField.ss
templates/TableListField.ss
2013-08-07 17:14:47 +02:00
wernerkrauss
eee32b7f3c
Update en.yml
...
Added missing string Security.LOSTPASSWORDHEADER
2013-08-07 11:06:20 +02:00
Ingo Schommer
00ffe72944
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
issues with unknown locales in Zend's CLDR database
2013-08-07 00:25:16 +02:00
Ingo Schommer
b58e2dbe3a
Member.lock_out_delay_mins configurable, password security docs
2013-07-11 09:47:28 +02:00
Ingo Schommer
95a206290f
Updated translations
2013-06-03 00:07:59 +02:00
Ingo Schommer
933fbf8ea4
l10n key to make "yes" and "no" translatable (see #1749 )
2013-04-12 01:11:24 +02:00
Ingo Schommer
ed19bbc3ba
Removed LOLCAT locale - sadly not supported by our translation infrastructure ( fixes #1457 )
...
It breaks the CMS when selected. If there's interest in maintaining it, we can re-add.
2013-04-04 11:03:37 +02:00
Ingo Schommer
d888ea5e67
Updated translations
2013-02-26 13:15:00 +01:00
Ingo Schommer
d3d0b21e80
Updated translations
2013-02-18 01:17:30 +01:00
Ingo Schommer
6c7e3afab3
Updated translations
2013-01-21 12:57:15 +01:00
Ingo Schommer
661a4a2492
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:46:38 +01:00
Ingo Schommer
3b59d4a762
Updated translations
2012-12-17 11:45:09 +01:00
Sean Harvey
50d6296a7d
Updating default en.yml translations
2012-11-07 11:42:08 +13:00
Sean Harvey
1861751ff3
Updated translations
2012-11-05 11:42:15 +13:00
Sean Harvey
71c20be997
Updating default en.yml with updated entities
2012-11-05 11:16:14 +13:00
Ingo Schommer
434f03df79
Updated translations
2012-09-12 10:55:24 +02:00
Ingo Schommer
36d514d551
Updated translations
2012-09-11 14:37:15 +02:00
Ingo Schommer
ea9041df54
Localization for "cancel" button in GridFieldDetailForm
2012-09-11 14:36:07 +02:00
Ingo Schommer
dddc5bdf46
Removed accidental *.orig files
2012-08-27 09:06:10 +02:00
Ingo Schommer
0a6a3fa936
i18n for file type descriptors (see #7798 )
2012-08-27 00:02:52 +02:00
Ingo Schommer
3b592122fd
i18n for "select an anchor" string (see #7798 )
2012-08-26 23:58:31 +02:00
Ingo Schommer
0aa28943ff
Updated translations
2012-08-23 23:34:42 +02:00