tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged from branches/2.3 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76915 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-15 00:11:25 +00:00
parent 0fbe39262f
commit be8f29c5e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Requirements.php
View File

@ -886,7 +886,7 @@ class Requirements_Backend {
$fileContent = JSMin::minify($fileContent);
}
// write a header comment for each file for easier identification and debugging
$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n;\n";
$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n\n";
}
if(!file_exists(dirname($base . $combinedFile))) {
Filesystem::makeFolder(dirname($base . $combinedFile));

10
lang/en_US.php
View File

@ -3,7 +3,7 @@
global $lang;
$lang['en_US']['Page']['PLURALNAME'] = array(
'Pags',
'Pages',
50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
);
@ -185,7 +185,7 @@ $lang['en_US']['ErrorPage']['CODE'] = 'Error code';
$lang['en_US']['ErrorPage']['DEFAULTERRORPAGECONTENT'] = '<p>Sorry, it seems you were trying to access a page that doesn\'t exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>';
$lang['en_US']['ErrorPage']['DEFAULTERRORPAGETITLE'] = 'Page not found';
$lang['en_US']['ErrorPage']['PLURALNAME'] = array(
'Error Pags',
'Error Pages',
50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
);
@ -271,7 +271,7 @@ $lang['en_US']['GSTNumberField']['VALIDATION'] = 'Please enter a valid GST Numbe
$lang['en_US']['GSTNumberField']['VALIDATIONJS'] = 'Please enter a valid GST Number';
$lang['en_US']['GhostPage']['NOLINKED'] = 'This ghost page has no linked page.';
$lang['en_US']['GhostPage']['PLURALNAME'] = array(
'Ghost Pags',
'Ghost Pages',
50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
);
@ -612,7 +612,7 @@ $lang['en_US']['RedirectorPage']['HASBEENSETUP'] = 'A redirector page has been s
$lang['en_US']['RedirectorPage']['HEADER'] = 'This page will redirect users to another page';
$lang['en_US']['RedirectorPage']['OTHERURL'] = 'Other website URL';
$lang['en_US']['RedirectorPage']['PLURALNAME'] = array(
'Redirector Pags',
'Redirector Pages',
50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
);
@ -819,7 +819,7 @@ $lang['en_US']['VirtualPage']['CHOOSE'] = 'Choose a page to link to';
$lang['en_US']['VirtualPage']['EDITCONTENT'] = 'click here to edit the content';
$lang['en_US']['VirtualPage']['HEADER'] = 'This is a virtual page';
$lang['en_US']['VirtualPage']['PLURALNAME'] = array(
'Virtual Pags',
'Virtual Pages',
50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
);