From 1dea06a698f285628bdb79fd12470ede58a81b39 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 10 Jan 2008 22:27:38 +0000 Subject: [PATCH] rbarreiros: #1907 - Patch for more i18n strings git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47849 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CommentAdmin.php | 6 ++-- code/MemberTableField.php | 34 +++++++++---------- code/SecurityAdmin.php | 1 + lang/en_US.php | 71 +++++++++++++++++++++++++++++++++++++++ lang/pt_PT.php | 70 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 20 deletions(-) diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php index cabf6c8e..277d0813 100644 --- a/code/CommentAdmin.php +++ b/code/CommentAdmin.php @@ -15,8 +15,8 @@ class CommentAdmin extends LeftAndMain { public function init() { parent::init(); - Requirements::javascript("cms/javascript/CommentAdmin_right.js"); - Requirements::css("cms/css/CommentAdmin.css"); + Requirements::javascript('cms/javascript/CommentAdmin_right.js'); + Requirements::css('cms/css/CommentAdmin.css'); } public function Link($action = null) { @@ -134,7 +134,7 @@ JS; function deleteall() { $numComments = 0; - $spam = DataObject::get('PageComment', "PageComment.IsSpam=1"); + $spam = DataObject::get('PageComment', 'PageComment.IsSpam=1'); if($spam) { $numComments = $spam->Count(); diff --git a/code/MemberTableField.php b/code/MemberTableField.php index c50e3b70..954cee98 100755 --- a/code/MemberTableField.php +++ b/code/MemberTableField.php @@ -117,21 +117,21 @@ class MemberTableField extends ComplexTableField { parent::__construct($controller, $name, $sourceClass, $fieldList); - Requirements::javascript("cms/javascript/MemberTableField.js"); + Requirements::javascript('cms/javascript/MemberTableField.js'); // construct the filter and sort if(isset($_REQUEST['MemberOrderByField'])) { - $this->sourceSort = "`" . Convert::raw2sql($_REQUEST['MemberOrderByField']) . "`" . Convert::raw2sql( $_REQUEST['MemberOrderByOrder'] ); + $this->sourceSort = '`' . Convert::raw2sql($_REQUEST['MemberOrderByField']) . '`' . Convert::raw2sql( $_REQUEST['MemberOrderByOrder'] ); } // search $search = isset($_REQUEST['MemberSearch']) ? Convert::raw2sql($_REQUEST['MemberSearch']) : null; if(!empty($_REQUEST['MemberSearch'])) { //$this->sourceFilter[] = "( `Email` LIKE '%$search%' OR `FirstName` LIKE '%$search%' OR `Surname` LIKE '%$search%' )"; - $sourceF = "( "; + $sourceF = '( '; foreach( $fieldList as $k => $v ) - $sourceF .= "`$k` LIKE '%$search%' OR "; - $this->sourceFilter[] = substr( $sourceF, 0, -3 ) . ")"; + $sourceF .= '`$k` LIKE '%$search%' OR '; + $this->sourceFilter[] = substr( $sourceF, 0, -3 ) . ')'; } // filter by groups @@ -240,8 +240,8 @@ class MemberTableField extends ComplexTableField { * Remove member from group rather than from the database */ function delete() { - $groupID = Convert::raw2sql($_REQUEST["ctf"]["ID"]); - $memberID = Convert::raw2sql($_REQUEST["ctf"]["childID"]); + $groupID = Convert::raw2sql($_REQUEST['ctf']['ID']); + $memberID = Convert::raw2sql($_REQUEST['ctf']['childID']); if(is_numeric($groupID) && is_numeric($memberID)) { $member = DataObject::get_by_id('Member', $memberID); $member->Groups()->remove($groupID); @@ -261,11 +261,11 @@ class MemberTableField extends ComplexTableField { * ################################# */ function getParentClass() { - return "Group"; + return 'Group'; } function getParentIdName($childClass,$parentClass){ - return "GroupID"; + return 'GroupID'; } @@ -277,7 +277,7 @@ class MemberTableField extends ComplexTableField { function memberListWithGroupID($members, $group) { $newMembers = new DataObjectSet(); foreach($members as $member) { - $newMembers->push($member->customise(array("GroupID" => $group->ID))); + $newMembers->push($member->customise(array('GroupID' => $group->ID))); } return $newMembers; } @@ -301,12 +301,12 @@ class MemberTableField extends ComplexTableField { foreach($this->FieldList() as $fieldName=>$fieldTitle) { $fields->push(new TextField($fieldName)); } - $fields->push(new HiddenField("ctf[ID]", null, $this->group->ID)); + $fields->push(new HiddenField('ctf[ID]', null, $this->group->ID)); return new TabularStyle(new Form($this->controller,'AddRecordForm', $fields, new FieldSet( - new FormAction("addtogroup", _t('MemberTableField.ADD','Add')) + new FormAction('addtogroup', _t('MemberTableField.ADD','Add')) ) )); } @@ -323,7 +323,7 @@ class MemberTableField extends ComplexTableField { } // Setup limits - $limitClause = ""; + $limitClause = ''; if(isset($_REQUEST['ctf'][$this->Name()]['start']) && is_numeric($_REQUEST['ctf'][$this->Name()]['start'])) { $limitClause = ($_REQUEST['ctf'][$this->Name()]['start']) . ", {$this->pageSize}"; } else { @@ -339,7 +339,7 @@ class MemberTableField extends ComplexTableField { $this->sourceFilter, $this->sourceSort ); - $this->unpagedSourceItems = $this->group->Members( "", "", $this->sourceFilter, $this->sourceSort ); + $this->unpagedSourceItems = $this->group->Members( '', '', $this->sourceFilter, $this->sourceSort ); $this->totalCount = ($this->sourceItems) ? $this->sourceItems->TotalItems() : 0; return $this->sourceItems; } @@ -360,8 +360,8 @@ class MemberTableField_Popup extends ComplexTableField_Popup { function __construct($controller, $name, $fields, $sourceClass, $readonly=false, $validator = null) { parent::__construct($controller, $name, $fields, $sourceClass, $readonly, $validator); - Requirements::javascript("cms/javascript/MemberTableField.js"); - Requirements::javascript("cms/javascript/MemberTableField_popup.js"); + Requirements::javascript('cms/javascript/MemberTableField.js'); + Requirements::javascript('cms/javascript/MemberTableField_popup.js'); } @@ -383,7 +383,7 @@ class MemberTableField_Popup extends ComplexTableField_Popup { // if ajax-call in an iframe, close window by javascript, else redirect to referrer if(!Director::is_ajax()) { - Director::redirect(substr($_SERVER['REQUEST_URI'],0,strpos($_SERVER['REQUEST_URI'],"?"))); + Director::redirect(substr($_SERVER['REQUEST_URI'],0,strpos($_SERVER['REQUEST_URI'],'?'))); } } diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index 87d02c7e..1ff696c4 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -79,6 +79,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { $memberList->setController($this); $memberList->setPermissions(array('show', 'edit', 'delete', 'export', 'add')); $memberList->setParentClass('Group'); + $memberList->setPopupCaption(_t('SecurityAdmin.VIEWUSER', 'View User')); $fields->push($idField = new HiddenField("ID")); $idField->setValue($id); diff --git a/lang/en_US.php b/lang/en_US.php index 77793208..2da7e8a7 100755 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -493,4 +493,75 @@ $lang['en_US']['ViewArchivedEmail.ss']['HAVEASKED'] = array( ); $lang['en_US']['ViewArchivedEmail.ss']['CANACCESS'] = 'You can access the archived site at this link:'; +// New2 + +$lang['en_US']['MemberTableField.ss']['DISPLAYING'] = 'Displaying'; +$lang['en_US']['MemberTableField.ss']['TO'] = 'to'; +$lang['en_US']['MemberTableField.ss']['OF'] = 'of'; +$lang['en_US']['MemberTableField.ss']['EDITASSET'] = 'Edit file'; +$lang['en_US']['MemberTableField']['FIRSTNAME'] = 'Firstname'; +$lang['en_US']['MemberTableField']['SURNAME'] = 'Surname'; +$lang['en_US']['MemberTableField']['EMAIL'] = 'Email'; + +$lang['en_US']['GenericDataAdmin']['CSVEXPORT'] = 'Export to CSV'; + +$lang['en_US']['SecurityAdmin']['VIEWUSER'] = 'View User'; +$lang['en_US']['CMSMain']['ACCESSTO'] = array('Access to %s in CMS', + PR_MEDIUM, + '%s is a class name'); + +$lang['en_US']['CMSMain']['ASSETADMINNAME'] = 'Assets'; +$lang['en_US']['CMSMain']['BULKLOADERADMINNAME'] = 'Bulk Loader'; +$lang['en_US']['CMSMain']['CMSMAINNAME'] = 'Main CMS'; +$lang['en_US']['CMSMain']['COMMENTADMINNAME'] = 'Comments'; +$lang['en_US']['CMSMain']['GENERICDATAADMINNAME'] = 'Generic Data'; +$lang['en_US']['CMSMain']['LEFTANDMAINNAME'] = 'Left And Main'; +$lang['en_US']['CMSMain']['NEWSLETTERADMINNAME'] = 'Newsletter'; +$lang['en_US']['CMSMain']['REPORTADMINNAME'] = 'Reports'; +$lang['en_US']['CMSMain']['SECURITYADMINNAME'] = 'Security'; +$lang['en_US']['CMSMain']['STATISTICSADMINNAME'] = 'Statistics'; + +$lang['en_US']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments'; +$lang['en_US']['CommentAdmin']['WAITINGMODERATION'] = 'Comments Awaiting Moderation'; +$lang['en_US']['CommentAdmin']['SPAM'] = 'Spam'; +$lang['en_US']['CommentAdmin']['AUTHOR'] = 'Author'; +$lang['en_US']['CommentAdmin']['COMMENT'] = 'Comment'; +$lang['en_US']['CommentAdmin']['COMMENTS'] = 'Comments'; +$lang['en_US']['CommentAdmin']['PAGE'] = 'Page'; +$lang['en_US']['CommentAdmin']['CREATED'] = 'Date Posted'; +$lang['en_US']['CommentAdmin']['ACCEPT'] = 'Accept'; +$lang['en_US']['CommentAdmin']['MARKSPAM'] = 'Mark as spam'; +$lang['en_US']['CommentAdmin']['MARKNOTSPAM'] = 'Mark as not spam'; +$lang['en_US']['CommentAdmin']['DELETE'] = 'Delete'; +$lang['en_US']['CommentAdmin']['DELETEALL'] = 'Delete All'; +$lang['en_US']['CommentAdmin']['NAME'] = 'Name'; +$lang['en_US']['CommentAdmin']['EDIT'] = 'Edit'; + +$lang['en_US']['CommentTableField']['SEARCH'] = 'Search'; +$lang['en_US']['CommentTableField']['FILTER'] = 'Filter'; + +$lang['en_US']['CommentTableField.ss']['DISPLAYING'] = 'Displaying'; +$lang['en_US']['CommentTableField.ss']['TO'] = 'to'; +$lang['en_US']['CommentTableField.ss']['OF'] = 'of'; +$lang['en_US']['CommentTableField.ss']['NOITEMSFOUND'] = 'No items found'; +$lang['en_US']['CommentTableField.ss']['EDIT'] = 'Edit'; + +$lang['en_US']['CommentTableField.ss']['APPROVE'] = 'Approve this comment'; +$lang['en_US']['CommentTableField.ss']['MARKASSPAM'] = 'Mark this comment as spam'; +$lang['en_US']['CommentTableField.ss']['MARKASNOTSPAM'] = 'Mark this comment as not spam'; +$lang['en_US']['CommentTableField.ss']['DELETEROW'] = 'Delete this row'; + +$lang['en_US']['CommentAdmin_left.ss']['COMMENTS'] = 'Comments'; +$lang['en_US']['CommentAdmin_left.ss']['APPROVED'] = 'Approved'; +$lang['en_US']['CommentAdmin_left.ss']['WAITINGMODERATION'] = 'Awaiting Moderation'; +$lang['en_US']['CommentAdmin_left.ss']['SPAM'] = 'Spam'; + +$lang['en_US']['StatisticsAdmin']['SELECTREPORT'] = 'Select a report type from the left for a detailed look at site statistics'; + +$lang['en_US']['StatisticsAdmin_left.ss']['STATISTICS'] = 'Statistics'; +$lang['en_US']['StatisticsAdmin_left.ss']['VIEWS'] = 'Views'; +$lang['en_US']['StatisticsAdmin_left.ss']['TRENDS'] = 'Trends'; +$lang['en_US']['StatisticsAdmin_left.ss']['OS'] = 'Operating Systems'; +$lang['en_US']['StatisticsAdmin_left.ss']['BROWSERS'] = 'Browsers'; + ?> diff --git a/lang/pt_PT.php b/lang/pt_PT.php index b7457f0d..c22f0006 100644 --- a/lang/pt_PT.php +++ b/lang/pt_PT.php @@ -596,4 +596,74 @@ $lang['pt_PT']['CommentAdmin_right.ss']['WELCOME2'] = 'gestão de comentários. +// New2 + +$lang['pt_PT']['MemberTableField.ss']['DISPLAYING'] = 'A mostrar'; +$lang['pt_PT']['MemberTableField.ss']['TO'] = 'até'; +$lang['pt_PT']['MemberTableField.ss']['OF'] = 'de'; +$lang['pt_PT']['MemberTableField.ss']['EDITASSET'] = 'Editar ficheiro'; +$lang['pt_PT']['MemberTableField']['FIRSTNAME'] = 'Primeiro Nome'; +$lang['pt_PT']['MemberTableField']['SURNAME'] = 'Sobrenome'; +$lang['pt_PT']['MemberTableField']['EMAIL'] = 'Email'; + +$lang['pt_PT']['GenericDataAdmin']['CSVEXPORT'] = 'Exportar para CSV'; + +$lang['pt_PT']['SecurityAdmin']['VIEWUSER'] = 'Ver Utilizador'; + +$lang['pt_PT']['CMSMain']['ACCESSTO'] = array('Accesso a %s no CMS'); +$lang['pt_PT']['CMSMain']['ASSETADMINNAME'] = 'Ficheiros e Imagens'; +$lang['pt_PT']['CMSMain']['BULKLOADERADMINNAME'] = 'Acções em Volume'; +$lang['pt_PT']['CMSMain']['CMSMAINNAME'] = 'CMS Principal'; +$lang['pt_PT']['CMSMain']['COMMENTADMINNAME'] = 'Comentários'; +$lang['pt_PT']['CMSMain']['GENERICDATAADMINNAME'] = 'Dados Genéricos'; +$lang['pt_PT']['CMSMain']['LEFTANDMAINNAME'] = 'Esquerda e Principal'; +$lang['pt_PT']['CMSMain']['NEWSLETTERADMINNAME'] = 'Listas de Email'; +$lang['pt_PT']['CMSMain']['REPORTADMINNAME'] = 'Relatórios'; +$lang['pt_PT']['CMSMain']['SECURITYADMINNAME'] = 'Segurança'; +$lang['pt_PT']['CMSMain']['STATISTICSADMINNAME'] = 'Estatísticas'; + +$lang['pt_PT']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentários Aprovados'; +$lang['pt_PT']['CommentAdmin']['WAITINGMODERATION'] = 'Comentários por Aprovar'; +$lang['pt_PT']['CommentAdmin']['SPAM'] = 'Spam'; +$lang['pt_PT']['CommentAdmin']['AUTHOR'] = 'Autor'; +$lang['pt_PT']['CommentAdmin']['COMMENT'] = 'Comentário'; +$lang['pt_PT']['CommentAdmin']['COMMENTS'] = 'Comentários'; +$lang['pt_PT']['CommentAdmin']['PAGE'] = 'Página'; +$lang['pt_PT']['CommentAdmin']['CREATED'] = 'Criado em'; +$lang['pt_PT']['CommentAdmin']['ACCEPT'] = 'Aceitar'; +$lang['pt_PT']['CommentAdmin']['MARKSPAM'] = 'Marcar como spam'; +$lang['pt_PT']['CommentAdmin']['MARKNOTSPAM'] = 'Marcar como não sendo spam'; +$lang['pt_PT']['CommentAdmin']['DELETE'] = 'Apagar'; +$lang['pt_PT']['CommentAdmin']['DELETEALL'] = 'Apagar Todos'; +$lang['pt_PT']['CommentAdmin']['NAME'] = 'Nome'; +$lang['pt_PT']['CommentAdmin']['EDIT'] = 'Editar'; + +$lang['pt_PT']['CommentTableField']['SEARCH'] = 'Procurar'; +$lang['pt_PT']['CommentTableField']['FILTER'] = 'Filtro'; + +$lang['pt_PT']['CommentTableField.ss']['DISPLAYING'] = 'A mostrar'; +$lang['pt_PT']['CommentTableField.ss']['TO'] = 'até'; +$lang['pt_PT']['CommentTableField.ss']['OF'] = 'de'; +$lang['pt_PT']['CommentTableField.ss']['NOITEMSFOUND'] = 'Nenhum item encontrado'; +$lang['pt_PT']['CommentTableField.ss']['EDIT'] = 'Editar'; +$lang['pt_PT']['CommentTableField.ss']['APPROVE'] = 'Aprovar este comentário'; +$lang['pt_PT']['CommentTableField.ss']['MARKASSPAM'] = 'Marcar como spam'; +$lang['pt_PT']['CommentTableField.ss']['MARKASNOTSPAM'] = 'Marcar como não sendo spam'; +$lang['pt_PT']['CommentTableField.ss']['DELETEROW'] = 'Apagar esta linha'; + +$lang['pt_PT']['CommentAdmin_left.ss']['COMMENTS'] = 'Comentários'; +$lang['pt_PT']['CommentAdmin_left.ss']['APPROVED'] = 'Aprovados'; +$lang['pt_PT']['CommentAdmin_left.ss']['WAITINGMODERATION'] = 'Por Aprovar'; +$lang['pt_PT']['CommentAdmin_left.ss']['SPAM'] = 'Spam'; + +$lang['pt_PT']['StatisticsAdmin']['SELECTREPORT'] = 'Seleccione um relatório da esquerda para ver as estatísticas do site mais detalhadamente'; + +$lang['pt_PT']['StatisticsAdmin_left.ss']['STATISTICS'] = 'Estatísticas'; +$lang['pt_PT']['StatisticsAdmin_left.ss']['VIEWS'] = 'Visualizações'; +$lang['pt_PT']['StatisticsAdmin_left.ss']['TRENDS'] = 'Tendências'; +$lang['pt_PT']['StatisticsAdmin_left.ss']['OS'] = 'Sistemas Operativos'; +$lang['pt_PT']['StatisticsAdmin_left.ss']['BROWSERS'] = 'Browsers'; + + + ?> \ No newline at end of file