+ + + + - + - + - + - + - + - + - + @@ -95,7 +70,7 @@
Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: ampache-dev <ampache-dev <at> lists.oregonstate.edu>
Subject: Ampache SVN - r2452 - in trunk: . templates
Newsgroups: gmane.comp.web.ampache.devel
Date: Saturday 18th September 2010 14:58:24 UTC (over 6 years ago)
Author: flowerysong
Date: 2010-09-18 07:58:23 -0700 (Sat, 18 Sep 2010)
New Revision: 2452

Added:
   trunk/templates/install_header.inc.php
Modified:
   trunk/lostpassword.php
   trunk/templates/show_install.inc.php
   trunk/templates/show_install_account.inc.php
   trunk/templates/show_install_check.inc.php
   trunk/templates/show_install_config.inc.php
   trunk/templates/show_install_lang.inc.php
Log:
Some grammar fixes and a code dedupe for installation.  Identical code in 5
files makes the baby Jesus cry and eventually results in the code not being
identical.


Modified: trunk/lostpassword.php
===================================================================
--- trunk/lostpassword.php	2010-08-17 20:59:16 UTC (rev 2451)
+++ trunk/lostpassword.php	2010-09-18 14:58:23 UTC (rev 2452)
@@ -36,9 +36,9 @@
 			$result = send_newpassword($email, $current_ip);
 		}
 		if ($result) {
-			Error::add('general',_('Password has been send'));
+			Error::add('general', _('Password has been sent'));
 		} else {
-			Error::add('general',_('Password has not been send'));
+			Error::add('general', _('Password has not been sent'));
 		}
 
 		require Config::get('prefix') . '/templates/show_login_form.inc.php';
@@ -60,7 +60,7 @@
 		AmpacheMail::$fromname = "Ampache";
 		AmpacheMail::$sender = $GLOBALS['user']->email;
 
-		$message  = sprintf(_("An user from %s has requested an new password."),
$current_ip);
+		$message  = sprintf(_("A user from %s has requested a new password."),
$current_ip);
 		$message .= "\n";
 		$message .= sprintf(_("The password has been set to: %s"),
$newpassword);
 		AmpacheMail::$message = $message;

Added: trunk/templates/install_header.inc.php
===================================================================
--- trunk/templates/install_header.inc.php	                        (rev 0)
+++ trunk/templates/install_header.inc.php	2010-09-18 14:58:23 UTC (rev
2452)
@@ -0,0 +1,53 @@
+
+
+
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+http://www.w3.org/1999/xhtml"
xml:lang="" lang="">
+
+Ampache :: Pour l'Amour de la Musique - Install
+
+
+
+
+
+
+
+
+
+

+

+ +

+
    +
  • +
  • +
+

+ +

+
Modified: trunk/templates/show_install.inc.php =================================================================== --- trunk/templates/show_install.inc.php 2010-08-17 20:59:16 UTC (rev 2451) +++ trunk/templates/show_install.inc.php 2010-09-18 14:58:23 UTC (rev 2452) @@ -19,47 +19,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (!defined('INSTALL')) { exit; } $prefix = realpath(dirname(__FILE__). "/../"); -$dir = is_rtl($htmllang) ? 'rtl' : 'ltr'; +require $prefix . '/templates/install_header.inc.php'; ?> -http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -http://www.w3.org/1999/xhtml" xml:lang="" lang="" dir=""> - -Ampache :: For The Love Of Music - Install - - - - - - - -
- -
-

-

- -

-
    -
  • -
  • -
-

- -

-
-
-
+
-
+
-
-
+
+


Modified: trunk/templates/show_install_account.inc.php =================================================================== --- trunk/templates/show_install_account.inc.php 2010-08-17 20:59:16 UTC (rev 2451) +++ trunk/templates/show_install_account.inc.php 2010-09-18 14:58:23 UTC (rev 2452) @@ -20,39 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (!defined('INSTALL')) { exit; } $prefix = realpath(dirname(__FILE__). "/../"); +require $prefix . '/templates/install_header.inc.php'; ?> -http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -http://www.w3.org/1999/xhtml" xml:lang="" lang=""> - -Ampache :: For The Love Of Music - Install - - - - - - -
- -
- -
-
    -
  • -
  • -
- -
-
-
-
+
+
+
-
+

Modified: trunk/templates/show_install_check.inc.php =================================================================== --- trunk/templates/show_install_check.inc.php 2010-08-17 20:59:16 UTC (rev 2451) +++ trunk/templates/show_install_check.inc.php 2010-09-18 14:58:23 UTC (rev 2452) @@ -38,6 +38,20 @@
+ +
:
::
::
::

::
::
:: -http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -http://www.w3.org/1999/xhtml" xml:lang="" lang=""> - -Ampache :: For The Love Of Music - Install - - - - - -
- -
- -
-
    -
  • -
  • - -
- -
-
-
-
+
+
-
+
-
+

@@ -67,7 +42,7 @@
- +
[
- + [   - [] + []
Modified: trunk/templates/show_install_lang.inc.php =================================================================== --- trunk/templates/show_install_lang.inc.php 2010-08-17 20:59:16 UTC (rev 2451) +++ trunk/templates/show_install_lang.inc.php 2010-09-18 14:58:23 UTC (rev 2452) @@ -20,46 +20,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ $prefix = realpath(dirname(__FILE__). "/../"); +require $prefix . '/templates/install_header.inc.php'; ?> - - -http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -http://www.w3.org/1999/xhtml" xml:lang="" lang=""> - -Ampache :: Pour l'Amour de la Musique - Install - - - - - - - -
-
-

-

- -

- -

- -

-
- +
- +

  CD: 3ms