From 7ee0ec6158b65733597496f90861f3a83dfd0c06 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 15 Sep 2007 02:08:42 +0000
Subject: [PATCH] bfojcapell:  using new default locale and function name
 (merged from branches/gsoc)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41908 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php |  6 +++---
 lang/en.php          | 16 ----------------
 lang/en_US.php       | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100755 lang/en.php
 create mode 100755 lang/en_US.php

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 1a7b1ddb..012e0da4 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -161,9 +161,9 @@ abstract class LeftAndMain extends Controller {
 		// array[2]: The controller class for this menu, used to check permisssions.  If blank, it's assumed that this is public, and always shown to
 		//           users who have the rights to access some other part of the admin area.
 		$menuSrc = array(
-			_(__FILE__,'HELLO',"Site content",100,"Menu title") => array("content", "admin/", "CMSMain"),
-			_(__FILE__,'FILESIMAGES',"Files & Images",100) => array("files", "admin/assets/", "AssetAdmin"),
-			_("LeftAndMain",'NEWSLETTERS',"Newsletters") => array("newsletter", "admin/newsletter/", "NewsletterAdmin"),
+			_t  ( 'LeftAndMain.HELLO',  "Site content",100,"Menu title") => array("content", "admin/", "CMSMain"),
+			_t('LeftAndMain.FILESIMAGES',"Files & Images",100) => array("files", "admin/assets/", "AssetAdmin"),
+			_t('LeftAndMain.NEWSLETTERS',"Newsletters") => array("newsletter", "admin/newsletter/", "NewsletterAdmin"),
 			"Reports" => array("report", "admin/reports/", "ReportAdmin"),
 			"Security" => array("security", "admin/security/", "SecurityAdmin"),
 			"Comments" => array("comments", "admin/comments/", "CommentAdmin"),
diff --git a/lang/en.php b/lang/en.php
deleted file mode 100755
index fb2ec302..00000000
--- a/lang/en.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-global $lang;
-
-$lang['en']['LeftAndMain']['HELLO'] = array(
-	'Site content',
-	100,
-	'Menu title'
-);
-$lang['en']['LeftAndMain']['FILESIMAGES'] = array(
-	'Files & Images',
-	100
-);
-$lang['en']['LeftAndMain']['NEWSLETTERS'] = 'Newsletters';
-
-?>
\ No newline at end of file
diff --git a/lang/en_US.php b/lang/en_US.php
new file mode 100755
index 00000000..00023f0e
--- /dev/null
+++ b/lang/en_US.php
@@ -0,0 +1,16 @@
+<?php
+
+global $lang;
+
+$lang['en_US']['LeftAndMain']['HELLO'] = array(
+	'Site content',
+	100,
+	'Menu title'
+);
+$lang['en_US']['LeftAndMain']['FILESIMAGES'] = array(
+	'Files & Images',
+	100
+);
+$lang['en_US']['LeftAndMain']['NEWSLETTERS'] = 'Newsletters';
+
+?>
\ No newline at end of file