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 #8357 from creative-commoners/pulls/4.3/fix-i18n

Browse Source 
FIX Text collector translations now compile without errors
This commit is contained in:
Loz Calver 2018-10-11 13:16:23 +02:00 committed by GitHub
commit dca2d47127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/en.yml
View File

@ -37,6 +37,8 @@ en:
SilverStripe\Forms\CurrencyField:
CURRENCYSYMBOL: $
SilverStripe\Forms\DateField:
NOTSET: 'not set'
TODAY: today
VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
@ -101,14 +103,14 @@ en:
Save: Save
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
UnlinkSelfFailure: 'Cannot remove yourself from this group, you will lose admin rights'
SilverStripe\Forms\GridField\GridFieldPaginator:
OF: of
Page: Page
View: View
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\Forms\MoneyField:
FIELDLABELAMOUNT: Amount
FIELDLABELCURRENCY: Currency

4
src/Forms/DateField_Disabled.php
View File

@ -17,7 +17,7 @@ class DateField_Disabled extends DateField
public function Field($properties = [])
{
// Default display value
$displayValue = '<i>(' . _t(DateField::class . '.NOTSET', 'not set') . ')</i>';
$displayValue = '<i>(' . _t('SilverStripe\\Forms\\DateField.NOTSET', 'not set') . ')</i>';
$value = $this->dataValue();
@ -29,7 +29,7 @@ class DateField_Disabled extends DateField
if ($df->IsToday()) {
// e.g. 2018-06-01 (today)
$format = '%s (%s)';
$infoComplement = _t(DateField::class . '.TODAY', 'today');
$infoComplement = _t('SilverStripe\\Forms\\DateField.TODAY', 'today');
} else {
// e.g. 2018-06-01, 5 days ago
$format = '%s, %s';