Changeset 274

Timestamp:

04/12/08 21:14:59 (9 months ago)

Author:

shupp

Message:

Got gettext support working using a custom request parser and a custom controller to call that parser. Removed the old Framework_User_Lang class

Files:

• trunk/Framework/Controller (added)
• trunk/Framework/Controller/ToasterAdmin.php (added)
• trunk/Framework/Module/Accounts/Modify.php (modified) (1 diff)
• trunk/Framework/Module/Login.php (modified) (1 diff)
• trunk/Framework/Request (added)
• trunk/Framework/Request/ToasterAdmin.php (added)
• trunk/Framework/Site/Default/locale/en/LC_MESSAGES/messages.mo (modified) (previous)
• trunk/Framework/Site/Default/locale/en/LC_MESSAGES/messages.po (modified) (2 diffs)
• trunk/Framework/User/Lang.php (deleted)
• trunk/ToasterAdmin/Common.php (modified) (1 diff)
• trunk/htdocs/index.php (modified) (1 diff)

trunk/Framework/Module/Accounts/Modify.php

@@ -102 +102 @@
-    protected function modifyAccountForm($account, $defaults)
-    {
-
-        // Language stuff
-        if ($this->user->isDomainAdmin($this->domain)) {
-            $this->setData('isDomainAdmin', 1);

trunk/Framework/Module/Login.php

@@ -30 +30 @@
-class Framework_Module_Login extends Framework_Auth_No
-{
+
+    /**
+     * controllers 
+     * 
+     * We're using a custom controller here to add gettext support
+     * 
+     * @var string
+     * @access public
+     */
+    public $controllers = array('ToasterAdmin');
+
-    /**
-     * __default

trunk/Framework/Site/Default/locale/en/LC_MESSAGES/messages.po

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-7-02-07 19:51-06
+8-04-12 16:52-07
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Bill Shupp <hostmaster@shupp.org>\n"
@@ -17 +17 @@
-"Content-Transfer-Encoding: 8bit\n"
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Error: no domain supplied"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-msgid "Account Deleted Successfully"
-msgstr ""
-
-6
+8 ../Framework/Module/Responders.php:274
-msgid "Delete Canceled"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-msgid "Add Domain"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-msgid "Please a domain name"
-msgstr ""
-
-91
+50
-msgid "Please enter a postmaster password"
-msgstr ""
-
-
-
-
-
-
+
-msgid "Domain deleted successfully"
-msgstr ""
-
-45
+16
-msgid "Domain deletion canceled"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-msgid "No Forwards.  Care to add one?"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-msgid "Forward Name"
-msgstr ""
-
-58 ../Framework/Module/Forwards.php:343
+49 ../Framework/Module/Forwards.php:387
-msgid "Destination Address"
-msgstr ""
-
-
+
+
+
+
-msgid "Add"
-msgstr ""
-
-61 ../Framework/Module/Forwards.php:346
+53 ../Framework/Module/Forwards.php:390
-msgid "Forward is required"
-msgstr ""
-
-62
+55
-msgid ""
-"Forward name is invalid (should be forward name only, not full email address"
-msgstr ""
-
-63 ../Framework/Module/Forwards.php:347
+57 ../Framework/Module/Forwards.php:392
-msgid "Destination is required"
-msgstr ""
-
-64 ../Framework/Module/Forwards.php:348
+59 ../Framework/Module/Forwards.php:394
-msgid "Destination must be a full email address"
-msgstr ""
-
-
-
-
-
-
+
-msgid "Forward Added Successfully"
-msgstr ""
-
-31
+57
-msgid "Error: forward line does not exist"
-msgstr ""
-
-36
+62
-msgid "Only one line, use delete instead"
-msgstr ""
-
-57 ../Framework/Module/Forwards.php:358
-395
+87 ../Framework/Module/Forwards.php:409
+451
-msgid "Error: no forward provided"
-msgstr ""
-
-18
+61
-msgid "Error: destination already exists"
-msgstr ""
-
-2
+6
-msgid "Destination Added Successfully"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Modify Forward"
-msgstr ""
-
-../Framework/Module/Forwards.php:331
+/tmp/gettext_files.643.smarty:152
-msgid "Destination"
-msgstr ""
-
-
+
+
+
+
+
-msgid "Forwards Menu"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/ToasterAdmin/Common.php

@@ -42 +42 @@
-     */
-    public $domain = null;
+
+    /**
+     * controllers 
+     * 
+     * We're using a custom controller here to add gettext support
+     * 
+     * @var string
+     * @access public
+     */
+    public $controllers = array('ToasterAdmin');
-
-    /**

trunk/htdocs/index.php

@@ -31 +31 @@
-    require_once 'Framework.php';
-
-Web
+ToasterAdmin
-    if (isset($_GET['Controller'])) {
-        $controller = $_GET['Controller'];