From ee66527608342d090cd5024ac5bc2cdfaafaa9ee Mon Sep 17 00:00:00 2001 From: Levis Bisson Date: Mon, 10 Oct 2005 22:30:57 +0000 Subject: [PATCH] ^ Added _Lang_ to the files located in the admin templates dir git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@440 6f6e1ebd-4c2b-0410-823f-f34bde69bce9 --- administrator/language/english/english.ini | 8 +++++-- .../templates/joomla_admin/index.php | 21 +++++++++--------- .../templates/joomla_admin/login.php | 22 +++++++++---------- administrator/templates/mambo_admin/index.php | 15 ++++++------- .../templates/mambo_admin_blue/index.php | 15 ++++++------- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/administrator/language/english/english.ini b/administrator/language/english/english.ini index ca018338a52..8214e76f37e 100644 --- a/administrator/language/english/english.ini +++ b/administrator/language/english/english.ini @@ -37,6 +37,7 @@ CATEGORIES=Categories CATEGORY=Category CATEGORY MANAGER=Category Manager CHANGE CREATOR=Change Creator +CHECK FOR LATEST VERSION=Check for latest Version CHECKED OUT=Checked out CHECKIN MANAGER=Checkin Manager CLEAN CACHE=Clean Cache @@ -147,6 +148,7 @@ ITEM CHECKED IN=Item Checked In ITEM DETAILS=Item Details ITEM TITLE=Item Title ITEMS=Items +JOOMLA! LOGO=Joomla! Logo LANGUAGE MANAGER=Language Manager LANGUAGES=Languages LAST=last @@ -158,12 +160,12 @@ LIST FILES=List Files LIST LENGTH=List Length LIST OF COMPONENTS=List of Components LIST PACKAGES=List Packages +LOGIN=Login LOGGED IN USER=Logged in User LOGOUT=Logout MAIL=Mail MAKE UNWRITEABLE AFTER SAVING=Make unwriteable after saving MAKE WRITEABLE AFTER SAVING=Make writeable after saving -MAMBO LOGO=Mambo Logo MAMBOTS=Mambots MAX SIZE=Max Size MEDIA=Media @@ -276,6 +278,7 @@ RESULTS=Results SAVE=Save SAVE ORDER=Save Order SEARCH TEXT=Search Text +SECONDS=seconds SECTION=Section SECTION MANAGER=Section Manager SECURITY=security @@ -352,8 +355,9 @@ VALIDUSERPASS=Incorrect Username and Password, please try again VALIDUSERPASSACCESS=Incorrect Username, Password, or Access Level. Please try again VERSION=Version VOTE=Vote +WARNJAVASCRIPT=!Warning! Javascript must be enabled for proper operation of the Administrator WEB=Web -WELCOME TO MAMBO=Welcome to Mambo +WELCOME TO JOOMLA!=Welcome to Joomla! WIDTH=Width WRITEABLE=Writeable YES=Yes diff --git a/administrator/templates/joomla_admin/index.php b/administrator/templates/joomla_admin/index.php index ada03bf5614..befca28cdd0 100644 --- a/administrator/templates/joomla_admin/index.php +++ b/administrator/templates/joomla_admin/index.php @@ -15,15 +15,14 @@ defined( '_VALID_MOS' ) or die( 'Restricted access' ); $tstart = mosProfiler::getmicrotime(); -// needed to seperate the ISO number from the language file constant _ISO -$iso = explode( '=', _ISO ); + // xml prolog -echo ''; +echo 'iso() .'"?' .'>'; ?> - + -<?php echo $mosConfig_sitename; ?> - Administration [Joomla] +<?php echo $mosConfig_sitename; ?> - <?php echo $_LANG->_( 'Administration' ); ?> [Joomla] @@ -33,15 +32,15 @@ echo ''; include_once( $mosConfig_absolute_path . '/editor/editor.php' ); initEditor(); ?> - - + +
@@ -56,7 +55,7 @@ initEditor(); @@ -92,14 +91,14 @@ initEditor();

- Check for latest Version + _( 'Check for latest Version' ); ?>
'; $tend = mosProfiler::getmicrotime(); $totaltime = ($tend - $tstart); - printf ("Page was generated in %f seconds", $totaltime); + printf ( $_LANG->_( 'Page was generated in' ) ." %f ". $_LANG->_( 'seconds' ), $totaltime); echo ''; } ?> diff --git a/administrator/templates/joomla_admin/login.php b/administrator/templates/joomla_admin/login.php index af503124162..5ffd7ed48db 100644 --- a/administrator/templates/joomla_admin/login.php +++ b/administrator/templates/joomla_admin/login.php @@ -20,8 +20,8 @@ $tstart = mosProfiler::getmicrotime(); -<?php echo $mosConfig_sitename; ?> - Administration [Joomla] - +<?php echo $mosConfig_sitename; ?> - <?php echo $_LANG->_( 'Administration' ); ?> [Joomla] + @@ -36,34 +36,34 @@ $tstart = mosProfiler::getmicrotime();
diff --git a/administrator/templates/mambo_admin/index.php b/administrator/templates/mambo_admin/index.php index cecb7c5d435..34c6a0fb39b 100644 --- a/administrator/templates/mambo_admin/index.php +++ b/administrator/templates/mambo_admin/index.php @@ -11,15 +11,14 @@ defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); $tstart = mosProfiler::getmicrotime(); -// needed to seperate the ISO number from the language file constant _ISO -$iso = explode( '=', _ISO ); + // xml prolog -echo ''; +echo 'iso() .'"?' .'>'; ?> - + -<?php echo $mosConfig_sitename; ?> - Administration [Mambo] +<?php echo $mosConfig_sitename; ?> - <?php echo $_LANG->_( 'Administration' ); ?> [Joomla] @@ -29,7 +28,7 @@ echo ''; include_once( $mosConfig_absolute_path . "/editor/editor.php" ); initEditor(); ?> - +
- Logout + _( 'Logout' ); ?> username;?>