Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX Text collector translations now compile without errors #8357

Merged
merged 1 commit into from
Oct 11, 2018
Merged

FIX Text collector translations now compile without errors #8357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lang/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})'
Expand Down Expand Up @@ -97,14 +99,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
Expand Down
4 changes: 2 additions & 2 deletions src/Forms/DateField_Disabled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -29,7 +29,7 @@ public function Field($properties = [])
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';
Expand Down