From 4de0dd7403a5b5aa09b5387c3bfc7a9ca9b171c4 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sat, 15 Dec 2012 13:40:09 -0800
Subject: [PATCH] Language file cleanup

---
 e107_plugins/gallery/controllers/index.php             |  4 ++--
 .../gallery/languages/English/English_global.php       | 10 ++++++++++
 e107_plugins/gallery/languages/English/admin.php       |  8 --------
 e107_plugins/gallery/languages/English/front.php       |  9 ---------
 e107_plugins/gallery/plugin.xml                        | 10 +++-------
 5 files changed, 15 insertions(+), 26 deletions(-)
 create mode 100644 e107_plugins/gallery/languages/English/English_global.php
 delete mode 100644 e107_plugins/gallery/languages/English/admin.php
 delete mode 100644 e107_plugins/gallery/languages/English/front.php

diff --git a/e107_plugins/gallery/controllers/index.php b/e107_plugins/gallery/controllers/index.php
index 957be86e0..42c7cc326 100644
--- a/e107_plugins/gallery/controllers/index.php
+++ b/e107_plugins/gallery/controllers/index.php
@@ -90,7 +90,7 @@ class plugin_gallery_index_controller extends eControllerFront
 			$text .= e107::getParser()->parseTemplate($template['CAT_ITEM'],TRUE);
 		}	
 		$text = $template['CAT_START'].$text.$template['CAT_END'];
-		$this->addTitle(GALLERY_LAN_TITLE)
+		$this->addTitle(LAN_PLUGIN_GALLERY_TITLE)
 			->addBody($text);
 	}
 	
@@ -150,7 +150,7 @@ class plugin_gallery_index_controller extends eControllerFront
 		$text .= $tp->parseTemplate($template['LIST_END'],TRUE);
 		
 		$this->addTitle($catname)
-			->addTitle(GALLERY_LAN_TITLE)
+			->addTitle(LAN_PLUGIN_GALLERY_TITLE)
 			->addBody($text);
 	}
 }
diff --git a/e107_plugins/gallery/languages/English/English_global.php b/e107_plugins/gallery/languages/English/English_global.php
new file mode 100644
index 000000000..b906b82d1
--- /dev/null
+++ b/e107_plugins/gallery/languages/English/English_global.php
@@ -0,0 +1,10 @@
+<?php
+/*
+* Copyright (c) e107 Inc 2008-2012 - e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+* $Id$
+*
+* Gallery Global Language
+*/
+define("LAN_PLUGIN_GALLERY_TITLE",	"Gallery");
+define("LAN_PLUGIN_GALLERY_DIZ", 	"A simple image gallery");
+
diff --git a/e107_plugins/gallery/languages/English/admin.php b/e107_plugins/gallery/languages/English/admin.php
deleted file mode 100644
index 2900debba..000000000
--- a/e107_plugins/gallery/languages/English/admin.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
-* Copyright (c) e107 Inc 2008-2012 - e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id$
-*
-* Gallery back-end laguage defines
-*/
-//define('GALLERY_ALAN_1', '');
diff --git a/e107_plugins/gallery/languages/English/front.php b/e107_plugins/gallery/languages/English/front.php
deleted file mode 100644
index d9d0f98ea..000000000
--- a/e107_plugins/gallery/languages/English/front.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/*
-* Copyright (c) e107 Inc 2008-2012 - e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id$
-*
-* Gallery front-end laguage defines
-*/
-define('GALLERY_LAN_TITLE', 'Gallery');
-//define('GALLERY_LAN_1', '');
diff --git a/e107_plugins/gallery/plugin.xml b/e107_plugins/gallery/plugin.xml
index ddf5245f6..3cb01d346 100644
--- a/e107_plugins/gallery/plugin.xml
+++ b/e107_plugins/gallery/plugin.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.15 2009-10-22 04:14:45 e107coders Exp $ -->
-<e107Plugin name="Gallery" lan="Gallery" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Gallery" lan="LAN_PLUGIN_GALLERY_TITLE" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" />
-	<description>Gallery</description>
+	<description lan="LAN_PLUGIN_GALLERY_DIZ">A simple image gallery</description>
 	<category>content</category>
-	<languageFiles>
-		<file type='install' path='languages/--LAN--/admin_gallery.php' />
-	</languageFiles>
 	<adminLinks>
 		<link url='admin_gallery.php' description='LAN_CONFIGURE' icon='images/gallery_32.png' iconSmall='images/gallery_16.png' primary='true' >LAN_CONFIGURE</link>		
 	</adminLinks>
 	<siteLinks>
-		<link url="{e_PLUGIN}gallery/gallery.php" sef="gallery" perm="everyone" >Gallery</link>	
+		<link url="{e_PLUGIN}gallery/gallery.php" sef="gallery" perm="everyone" >LAN_PLUGIN_GALLERY_TITLE</link>	
 	</siteLinks>	
 	<mainPrefs>
 	</mainPrefs>