From dc7e2df20a74976cd915eca39ee6bb7c1a6f7d39 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 6 Oct 2013 23:25:11 +0200 Subject: [PATCH] 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 --- admin/templates/Includes/LeftAndMain_Menu.ss | 4 +- .../Includes/ModelAdmin_ImportSpec.ss | 6 +- admin/templates/Includes/ModelAdmin_Tools.ss | 6 +- admin/templates/LeftAndMain.ss | 2 +- admin/templates/ModelSidebar.ss | 4 +- lang/en.yml | 128 ++++-------------- 6 files changed, 39 insertions(+), 111 deletions(-) diff --git a/admin/templates/Includes/LeftAndMain_Menu.ss b/admin/templates/Includes/LeftAndMain_Menu.ss index 1f1da0c03..6e558a533 100644 --- a/admin/templates/Includes/LeftAndMain_Menu.ss +++ b/admin/templates/Includes/LeftAndMain_Menu.ss @@ -8,10 +8,10 @@
- <% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %> + <% _t('LeftAndMain_Menu_ss.LOGOUT','Log out') %> <% with $CurrentMember %> - <% _t('LeftAndMain_Menu.ss.Hello','Hi') %> + <% _t('LeftAndMain_Menu_ss.Hello','Hi') %> <% if $FirstName && $Surname %>$FirstName $Surname<% else_if $FirstName %>$FirstName<% else %>$Email<% end_if %> diff --git a/admin/templates/Includes/ModelAdmin_ImportSpec.ss b/admin/templates/Includes/ModelAdmin_ImportSpec.ss index 3ccb9b0dc..ad7468a7c 100644 --- a/admin/templates/Includes/ModelAdmin_ImportSpec.ss +++ b/admin/templates/Includes/ModelAdmin_ImportSpec.ss @@ -1,8 +1,8 @@
<% sprintf(_t('IMPORTSPECLINK', 'Show Specification for %s'),$ModelName) %>
-

<% sprintf(_t('ModelAdmin_ImportSpec.ss.IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %>

-
<% _t('ModelAdmin_ImportSpec.ss.IMPORTSPECFIELDS', 'Database columns') %>
+

<% sprintf(_t('ModelAdmin_ImportSpec_ss.IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %>

+
<% _t('ModelAdmin_ImportSpec_ss.IMPORTSPECFIELDS', 'Database columns') %>
<% loop $Fields %>
$Name
@@ -10,7 +10,7 @@
<% end_loop %> -
<% _t('ModelAdmin_ImportSpec.ss.IMPORTSPECRELATIONS', 'Relations') %>
+
<% _t('ModelAdmin_ImportSpec_ss.IMPORTSPECRELATIONS', 'Relations') %>
<% loop $Relations %>
$Name
diff --git a/admin/templates/Includes/ModelAdmin_Tools.ss b/admin/templates/Includes/ModelAdmin_Tools.ss index 9dcf9a4ec..cea39ee2b 100644 --- a/admin/templates/Includes/ModelAdmin_Tools.ss +++ b/admin/templates/Includes/ModelAdmin_Tools.ss @@ -1,14 +1,14 @@
-

<% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %>

+

<% _t('ModelAdmin_Tools_ss.FILTER', 'Filter') %>

$SearchForm <% if $ImportForm %> -

<% _t('ModelAdmin_Tools.ss.IMPORT', 'Import') %>

+

<% _t('ModelAdmin_Tools_ss.IMPORT', 'Import') %>

$ImportForm <% end_if %>
-

<% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %>

+

<% _t('ModelAdmin_Tools_ss.FILTER', 'Filter') %>

diff --git a/admin/templates/LeftAndMain.ss b/admin/templates/LeftAndMain.ss index 41e74c84d..8b039407e 100644 --- a/admin/templates/LeftAndMain.ss +++ b/admin/templates/LeftAndMain.ss @@ -14,7 +14,7 @@ $Content
-
<% _t('CMSPageHistoryController_versions.ss.PREVIEW','Website preview') %>
+
<% _t('CMSPageHistoryController_versions_ss.PREVIEW','Website preview') %>
diff --git a/admin/templates/ModelSidebar.ss b/admin/templates/ModelSidebar.ss index 705708140..3599fba12 100644 --- a/admin/templates/ModelSidebar.ss +++ b/admin/templates/ModelSidebar.ss @@ -1,7 +1,7 @@ -

<% _t('ModelSidebar.ss.SEARCHLISTINGS','Search') %>

+

<% _t('ModelSidebar_ss.SEARCHLISTINGS','Search') %>

$SearchForm <% if $ImportForm %> -

<% _t('ModelSidebar.ss.IMPORT_TAB_HEADER', 'Import') %>

+

<% _t('ModelSidebar_ss.IMPORT_TAB_HEADER', 'Import') %>

$ImportForm <% end_if %> diff --git a/lang/en.yml b/lang/en.yml index 3a663524d..78f000c37 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -1,6 +1,5 @@ en: AssetAdmin: - ALLOWEDEXTS: 'Allowed extensions' NEWFOLDER: NewFolder SHOWALLOWEDEXTS: 'Show allowed extensions' AssetTableField: @@ -71,6 +70,8 @@ en: ACCESSALLINTERFACES: 'Access to all CMS sections' ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.' SAVE: Save + CMSPageHistoryController_versions_ss: + PREVIEW: 'Website preview' CMSProfileController: MENUTITLE: 'My Profile' ChangePasswordEmail_ss: @@ -82,23 +83,13 @@ en: CheckboxField: NOANSWER: No YESANSWER: Yes - ComplexTableField: - CLOSEPOPUP: 'Close Popup' - SUCCESSADD2: 'Added {name}' - SUCCESSEDIT: 'Saved %s %s %s' - ComplexTableField_ss: - ADDITEM: 'Add %s' - NOITEMSFOUND: 'No items found' - SORTASC: 'Sort ascending' - SORTDESC: 'Sort descending' - ComplexTableField_popup_ss: - NEXT: Next - PREVIOUS: Previous ConfirmedPasswordField: ATLEAST: 'Passwords must be at least {min} characters long.' BETWEEN: 'Passwords must be {min} to {max} characters long.' MAXIMUM: 'Passwords must be at most {max} characters long.' SHOWONCLICKTITLE: 'Change Password' + ContentController: + NOTLOGGEDIN: 'Not logged in' CreditCardField: FIRST: first FOURTH: fourth @@ -114,6 +105,7 @@ en: DAYS: days HOUR: hour HOURS: hours + LessThanMinuteAgo: 'less than a minute' MIN: min MINS: mins MONTH: month @@ -124,7 +116,6 @@ en: TIMEDIFFIN: 'in {difference}' YEAR: year YEARS: years - LessThanMinuteAgo: 'less than a minute' DateField: NOTSET: 'not set' TODAY: today @@ -137,11 +128,9 @@ en: INVALID_REQUEST: 'Invalid request' DropdownField: CHOOSE: (Choose) + CHOOSESEARCH: '(Choose or Search)' EmailField: VALIDATION: 'Please enter an email address' - Email_BounceRecord: - PLURALNAME: 'Email Bounce Records' - SINGULARNAME: 'Email Bounce Record' Enum: ANY: Any File: @@ -176,19 +165,6 @@ en: WavType: 'WAV audo file' XlsType: 'Excel spreadsheet' ZipType: 'ZIP compressed file' - FileIFrameField: - ATTACH: 'Attach {type}' - ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.' - ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.' - DELETE: 'Delete {type}' - DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded' - FILE: File - FROMCOMPUTER: 'From your Computer' - FROMFILESTORE: 'From the File Store' - NOSOURCE: 'Please select a source file to attach' - REPLACE: 'Replace {type}' - FileIFrameField_iframe_ss: - TITLE: 'Image Uploading Iframe' Filesystem: SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted' Folder: @@ -200,6 +176,7 @@ en: TEXT2: 'password reset link' TEXT3: for Form: + CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.' FIELDISREQUIRED: '{name} is required' SubmitBtnLabel: Go VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly' @@ -209,10 +186,9 @@ en: VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character' VALIDATOR: Validator VALIDCURRENCY: 'Please enter a valid currency' - CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.' FormField: - NONE: none Example: 'e.g. %s' + NONE: none GridAction: DELETE_DESCRIPTION: Delete Delete: Delete @@ -243,7 +219,9 @@ en: Deleted: 'Deleted %s %s' Save: Save Saved: 'Saved {name} {link}' - GridFieldItemEditView_ss: + GridFieldEditButton_ss: + EDIT: Edit + GridFieldItemEditView: Go_back: 'Go back' Group: AddRole: 'Add a role for this group' @@ -252,6 +230,7 @@ en: DefaultGroupTitleContentAuthors: 'Content Authors' Description: Description GroupReminder: 'If you choose a parent group, this group will take all it''s roles' + HierarchyPermsError: 'Can''t assign parent group "%s" with privileged permissions (requires ADMIN access)' Locked: 'Locked?' NoRoles: 'No roles found' PLURALNAME: Groups @@ -273,6 +252,7 @@ en: ADDURL: 'Add URL' ADJUSTDETAILSDIMENSIONS: 'Details & dimensions' ANCHORVALUE: Anchor + BUTTONADDURL: 'Add url' BUTTONINSERT: Insert BUTTONINSERTLINK: 'Insert link' BUTTONREMOVELINK: 'Remove link' @@ -314,12 +294,9 @@ en: URL: URL URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.' UpdateMEDIA: 'Update Media' - BUTTONADDURL: 'Add url' Image: PLURALNAME: Files SINGULARNAME: File - ImageField: - IMAGE: Image Image_Cached: PLURALNAME: Files SINGULARNAME: File @@ -338,10 +315,12 @@ en: PreviewButton: Preview REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.' SAVEDUP: Saved. - VersionUnknown: Unknown ShowAsList: 'show as list' TooManyPages: 'Too many pages' ValidationError: 'Validation error' + VersionUnknown: Unknown + LeftAndMain_Menu_ss: + LOGOUT: 'Log out' LeftAndMain_Menu_ss: Hello: Hi LOGOUT: 'Log out' @@ -366,7 +345,6 @@ en: EMAIL: Email EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again' ENTEREMAIL: 'Please enter an email address to get a password reset link.' - ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.' ERRORLOCKEDOUT2: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in {count} minutes.' ERRORNEWPASSWORD: 'You have entered your new password differently, try again' ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again' @@ -376,6 +354,7 @@ en: INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}' LOGGEDINAS: 'You''re logged in as {name}.' NEWPASSWORD: 'New Password' + NoPassword: 'There is no password on this member.' PASSWORD: Password PLURALNAME: Members REMEMBERME: 'Remember me next time?' @@ -395,7 +374,6 @@ en: db_NumVisit: 'Number of Visits' db_Password: Password db_PasswordExpiry: 'Password Expiry Date' - NoPassword: 'There is no password on this member.' MemberAuthenticator: TITLE: 'E-mail & Password' MemberDatetimeOptionsetField: @@ -411,7 +389,6 @@ en: MONTHNOLEADING: 'Month digit without leading zero' Preview: Preview SHORTMONTH: 'Short name of month (e.g. Jun)' - TOGGLEHELP: 'Toggle formatting help' TWODIGITDAY: 'Two-digit day of month' TWODIGITHOUR: 'Two digits of hour (00 through 23)' TWODIGITMINUTE: 'Two digits of minute (00 through 59)' @@ -443,8 +420,8 @@ en: Title: 'Data Models' UPDATEDRECORDS: 'Updated {count} records.' ModelAdmin_ImportSpec_ss: - IMPORTSPECFIELDS: 'Database columns' IMPORTSPECLINK: 'Show Specification for %s' + IMPORTSPECFIELDS: 'Database columns' IMPORTSPECRELATIONS: Relations IMPORTSPECTITLE: 'Specification for %s' ModelAdmin_Tools_ss: @@ -463,6 +440,10 @@ en: Pagination: Page: Page View: View + PasswordValidator: + LOWCHARSTRENGTH: 'Please increase password strength by adding some of the following characters: %s' + PREVPASSWORD: 'You''ve already used that password in the past, please choose a new password' + TOOSHORT: 'Password is too short, it must be %s or more characters long' Permission: AdminGroup: Administrator CMS_ACCESS_CATEGORY: 'CMS Access' @@ -482,19 +463,15 @@ en: Title: Title PermissionRoleCode: PLURALNAME: 'Permission Role Cods' + PermsError: 'Can''t assign code "%s" with privileged permissions (requires ADMIN access)' SINGULARNAME: 'Permission Role Code' Permissions: PERMISSIONS_CATEGORY: 'Roles and access permissions' UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.' PhoneNumberField: VALIDATION: 'Please enter a valid phone number' - RelationComplexTableField_ss: - ADD: Add - CSVEXPORT: 'Export to CSV' - NOTFOUND: 'No items found' Security: ALREADYLOGGEDIN: 'You don''t have access to this page. If you have another account that can access that page, you can log in again below.' - LOSTPASSWORDHEADER: 'Lost Password' BUTTONSEND: 'Send me the password reset link' CHANGEPASSWORDBELOW: 'You can change your password below.' CHANGEPASSWORDHEADER: 'Change your password' @@ -529,11 +506,11 @@ en: BtnImport: 'Import from CSV' FileFieldLabel: 'CSV File (Allowed extensions: *.csv)' SilverStripeNavigator: - Edit: Edit Auto: Auto ChangeViewMode: 'Change view mode' Desktop: Desktop DualWindowView: 'Dual Window' + Edit: Edit EditView: 'Edit mode' Mobile: Mobile PreviewState: 'Preview State' @@ -543,32 +520,13 @@ en: Tablet: Tablet ViewDeviceWidth: 'Select a preview width' Width: width - SimpleImageField: - NOUPLOAD: 'No Image Uploaded' SiteTree: TABMAIN: Main - TableField: - ISREQUIRED: 'In %s ''%s'' is required' - TableField_ss: - ADD: 'Add a new row' - ADDITEM: 'Add %s' TableListField: CSVEXPORT: 'Export to CSV' - PRINT: Print Print: Print - SELECT: 'Select:' - TableListField_ss: - NOITEMSFOUND: 'No items found' - SORTASC: 'Sort in ascending order' - SORTDESC: 'Sort in descending order' TableListField_PageControls_ss: - DISPLAYING: Displaying OF: of - TO: to - VIEWFIRST: 'View first' - VIEWLAST: 'View last' - VIEWNEXT: 'View next' - VIEWPREVIOUS: 'View previous' TimeField: VALIDATEFORMAT: 'Please enter a valid time format ({format})' ToggleField: @@ -578,6 +536,8 @@ en: ATTACHFILE: 'Attach a file' ATTACHFILES: 'Attach files' AttachFile: 'Attach file(s)' + CHOOSEANOTHERFILE: 'Choose another file' + CHOOSEANOTHERINFO: 'Replace this file with another one from the file store' DELETE: 'Delete from files' DELETEINFO: 'Permanently delete this file from the file store' DOEDIT: Save @@ -592,45 +552,13 @@ en: FROMFILES: 'From files' HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.' MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.' - MAXNUMBEROFFILESSHORT: 'Can only upload {count} files' MAXNUMBEROFFILESONE: 'Can only upload one file' + MAXNUMBEROFFILESSHORT: 'Can only upload {count} files' + OVERWRITEWARNING: 'File with the same name already exists' REMOVE: Remove - REMOVEERROR: 'Error removing file' REMOVEINFO: 'Remove this file from here, but do not delete it from the file store' STARTALL: 'Start all' - STARTALLINFO: 'Start all uploads' Saved: Saved - CHOOSEANOTHERFILE: 'Choose another file' - CHOOSEANOTHERINFO: 'Replace this file with another one from the file store' - OVERWRITEWARNING: 'File with the same name already exists' UPLOADSINTO: 'saves into /{path}' Versioned: has_many_Versions: Versions - CMSPageHistoryController_versions_ss: - PREVIEW: 'Website preview' - GridFieldEditButton_ss: - EDIT: Edit - CMSPageHistoryController_versions.ss: - PREVIEW: 'Website preview' - ContentController: - NOTLOGGEDIN: 'Not logged in' - GridFieldItemEditView: - Go_back: 'Go back' - LeftAndMain_Menu.ss: - Hello: Hi - LOGOUT: 'Log out' - ModelAdmin_ImportSpec.ss: - IMPORTSPECFIELDS: 'Database columns' - IMPORTSPECLINK: 'Show Specification for %s' - IMPORTSPECRELATIONS: Relations - IMPORTSPECTITLE: 'Specification for %s' - ModelAdmin_Tools.ss: - FILTER: Filter - IMPORT: Import - ModelSidebar.ss: - IMPORT_TAB_HEADER: Import - SEARCHLISTINGS: Search - PasswordValidator: - LOWCHARSTRENGTH: 'Please increase password strength by adding some of the following characters: %s' - PREVPASSWORD: 'You''ve already used that password in the past, please choose a new password' - TOOSHORT: 'Password is too short, it must be %s or more characters long'