MINOR: SSF-168 code convention correction

MINOR: SSF-168 add _t()'s where necessory in GridField print view
silverstripe · Apr 4, 2012 · a946096 · a946096
1 parent 5826b36
commit a946096
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/forms/gridfield/GridFieldPrintButton.php b/forms/gridfield/GridFieldPrintButton.php
@@ -135,12 +135,22 @@ function generatePrintData($gridField) {
 		//get title for the print view
 		$form = $gridField->getForm();
 		$currentController = Controller::curr();
-		$title = method_exists($currentController, 'Title')?$currentController->Title():
-					($currentController->Title?$currentController->Title:
-					($form?$form->Name():''));
-		if($fieldTitle = $gridField->Title()) $title .= ($title?' - ':'').$fieldTitle;
-
-		//$state = $gridField->getState(false)->__toString();
+		$title = '';
+		if(method_exists($currentController, 'Title')) {
+			$title = $currentController->Title();
+		}else{
+			if($currentController->Title){
+				$title = $currentController->Title;
+			}else{
+				if($form->Name()){
+					$title = $form->Name();
+				}
+			}
+		}
+		if($fieldTitle = $gridField->Title()){
+			if($title) $title .= " - ";
+			$title .= $fieldTitle;
+		}
 
 		$ret = new ArrayData(
 			array(

diff --git a/templates/Includes/GridField_print.ss b/templates/Includes/GridField_print.ss
@@ -16,9 +16,9 @@
 			</tbody>
 		</table>
 		<p>
-			Printed at $Datetime.Nice
+			<% _t('GridField.PRINTEDAT', 'Printed at') %> $Datetime.Time, $Datetime.Date
 			<br />
-			Printed by $Member.Name
+			<% _t('GridField.PRINTEDBY', 'Printed by') %> $Member.Name
 		</p>
 	</body>
 </html>