From 64c719ca2e280c0e32ceeba0d25d7e8652fe84fb Mon Sep 17 00:00:00 2001
From: mikelittle <mikelittle@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 23 Jul 2003 21:38:10 +0000
Subject: [PATCH] Configuration extras now in a single file.

git-svn-id: http://svn.automattic.com/wordpress/trunk@269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 day-month-trans.php                  | 25 -------------------------
 mysmilies.php => wp-config-extra.php | 27 +++++++++++++++++++++++++++
 wp-config.sample.php                 |  9 ++-------
 3 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 day-month-trans.php
 rename mysmilies.php => wp-config-extra.php (72%)

diff --git a/day-month-trans.php b/day-month-trans.php
deleted file mode 100644
index 600dcf9220..0000000000
--- a/day-month-trans.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// the weekdays and the months.. translate them if necessary
-$weekday[0]='Sunday';
-$weekday[1]='Monday';
-$weekday[2]='Tuesday';
-$weekday[3]='Wednesday';
-$weekday[4]='Thursday';
-$weekday[5]='Friday';
-$weekday[6]='Saturday';
-
-// the months, translate them if necessary - note: this isn't active everywhere yet
-$month['01']='January';
-$month['02']='February';
-$month['03']='March';
-$month['04']='April';
-$month['05']='May';
-$month['06']='June';
-$month['07']='July';
-$month['08']='August';
-$month['09']='September';
-$month['10']='October';
-$month['11']='November';
-$month['12']='December';
-
-?>
\ No newline at end of file
diff --git a/mysmilies.php b/wp-config-extra.php
similarity index 72%
rename from mysmilies.php
rename to wp-config-extra.php
index b61323f60f..cb1cb0b89c 100644
--- a/mysmilies.php
+++ b/wp-config-extra.php
@@ -1,4 +1,30 @@
 <?php
+// this file contains customizable arrays for smilies, weekdays and month names.
+
+    
+// the weekdays and the months.. translate them if necessary
+$weekday[0]='Sunday';
+$weekday[1]='Monday';
+$weekday[2]='Tuesday';
+$weekday[3]='Wednesday';
+$weekday[4]='Thursday';
+$weekday[5]='Friday';
+$weekday[6]='Saturday';
+
+// the months, translate them if necessary - note: this isn't active everywhere yet
+$month['01']='January';
+$month['02']='February';
+$month['03']='March';
+$month['04']='April';
+$month['05']='May';
+$month['06']='June';
+$month['07']='July';
+$month['08']='August';
+$month['09']='September';
+$month['10']='October';
+$month['11']='November';
+$month['12']='December';
+
 // here's the conversion table, you can modify it if you know what you're doing
 $b2smiliestrans = array(
     ':)'        => 'icon_smile.gif',
@@ -47,4 +73,5 @@ $b2smiliestrans = array(
     ':neutral:' => 'icon_neutral.gif',
     ':mrgreen:' => 'icon_mrgreen.gif',
 );
+
 ?>
\ No newline at end of file
diff --git a/wp-config.sample.php b/wp-config.sample.php
index 6894947860..a172a7fa8c 100644
--- a/wp-config.sample.php
+++ b/wp-config.sample.php
@@ -43,14 +43,9 @@ $passsql = DB_PASSWORD;
 $base = DB_NAME;
 
 $abspath = dirname(__FILE__).'/';
-// setup your own smilies (if not there is a set in b2vars)
-if (file_exists($abspath.'mysmilies.php')) {
-    include($abspath.'mysmilies.php');
-}
-
-// pull in the day and month translations
-require_once($abspath.'day-month-trans.php');
 
+// pull in the day and month translations and the smilies
+require_once($abspath.'wp-config-extra.php');
 require_once($abspath.$b2inc.'/wp-db.php');
 require_once($abspath.$b2inc.'/b2functions.php');
 require_once($abspath.'wp-settings.php');