Changeset 756

Show
Ignore:
Timestamp:
12/13/06 23:42:30 (2 years ago)
Author:
ben
Message:

Elggadmin is no longer internationalised for the moment. We will re-internationalise it in a future release.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/_elggadmin/config.php

    r603 r756  
    2525    // don't want to be editable 
    2626            $ADMINCFG->admin->noedit = array( 
    27                                                 "dbhost","dbuser","dbpass","dbpersist","prefix", 
    28                                                 "defaultlocale","rsspostsmaxage","dirroot", 
    29                                                 "wwwroot","dataroot","dbtype","dbname", 
    30                                                 "debug","maxusers" 
    3127                                            ); 
    3228     
  • devel/_elggadmin/configdef.php

    r659 r756  
    11<?php 
    22 
    3             $DEFCFG->config['sitename']->name = __gettext("Site name"); 
    4             $DEFCFG->config['sitename']->description = __gettext("Name of the site (eg Elgg, Apcala, University of Bogton's Social Network, etc)"); 
    5             $DEFCFG->config['tagline']->name = __gettext("Tagline"); 
    6             $DEFCFG->config['tagline']->description = __gettext("A tagline for your site (eg 'Social network for Bogton')"); 
    7             $DEFCFG->config['wwwroot']->name = __gettext("Web root"); 
    8             $DEFCFG->config['wwwroot']->description = __gettext("External URL to the site (eg http://elgg.bogton.edu/). NB: **MUST** have a final slash at the end"); 
    9             $DEFCFG->config['dirroot']->name = __gettext("Elgg install root"); 
    10             $DEFCFG->config['dirroot']->description = __gettext("Physical path to the files (eg /home/elggserver/httpdocs/). NB: **MUST** have a final slash at the end"); 
    11             $DEFCFG->config['dataroot']->name = __gettext("Elgg data root"); 
    12             $DEFCFG->config['dataroot']->description = __gettext("This is where uploaded files will go (and sessions for now). If possible, this should live outside your dirroot; **MUST** have a final slash at the end"); 
    13             $DEFCFG->config['sysadminemail']->name = __gettext("System administrator email"); 
    14             $DEFCFG->config['sysadminemail']->description = __gettext("The email address your site will send email from (eg elgg-admin@bogton.edu)"); 
    15             $DEFCFG->config['newsinitialpassword']->name = __gettext("News account initial password"); 
    16             $DEFCFG->config['newsinitialpassword']->description = __gettext("The initial password for the 'news' account. This will be the first administrator user within your system, and you should change the password immediately after the first time you log in"); 
    17             $DEFCFG->config['defaultlocale']->name = __gettext("Default locale"); 
    18             $DEFCFG->config['defaultlocale']->description = __gettext("Country code to set language to if you have gettext installed"); 
    19             $DEFCFG->config['publicreg']->name = __gettext("Public registration"); 
    20             $DEFCFG->config['publicreg']->description = __gettext("Can general members of the public register for this system?"); 
     3            $DEFCFG->config['sitename']->name = ("Site name"); 
     4            $DEFCFG->config['sitename']->description = ("Name of the site (eg Elgg, Apcala, University of Bogton's Social Network, etc)"); 
     5            $DEFCFG->config['tagline']->name = ("Tagline"); 
     6            $DEFCFG->config['tagline']->description = ("A tagline for your site (eg 'Social network for Bogton')"); 
     7            $DEFCFG->config['wwwroot']->name = ("Web root"); 
     8            $DEFCFG->config['wwwroot']->description = ("External URL to the site (eg http://elgg.bogton.edu/). NB: **MUST** have a final slash at the end"); 
     9            $DEFCFG->config['dirroot']->name = ("Elgg install root"); 
     10            $DEFCFG->config['dirroot']->description = ("Physical path to the files (eg /home/elggserver/httpdocs/). NB: **MUST** have a final slash at the end"); 
     11            $DEFCFG->config['dataroot']->name = ("Elgg data root"); 
     12            $DEFCFG->config['dataroot']->description = ("This is where uploaded files will go (and sessions for now). If possible, this should live outside your dirroot; **MUST** have a final slash at the end"); 
     13            $DEFCFG->config['sysadminemail']->name = ("System administrator email"); 
     14            $DEFCFG->config['sysadminemail']->description = ("The email address your site will send email from (eg elgg-admin@bogton.edu)"); 
     15            $DEFCFG->config['newsinitialpassword']->name = ("News account initial password"); 
     16            $DEFCFG->config['newsinitialpassword']->description = ("The initial password for the 'news' account. This will be the first administrator user within your system, and you should change the password immediately after the first time you log in"); 
     17            $DEFCFG->config['defaultlocale']->name = ("Default locale"); 
     18            $DEFCFG->config['defaultlocale']->description = ("Country code to set language to if you have gettext installed"); 
     19            $DEFCFG->config['publicreg']->name = ("Public registration"); 
     20            $DEFCFG->config['publicreg']->description = ("Can general members of the public register for this system?"); 
    2121            $DEFCFG->config['publicreg']->type = "boolean"; 
    22             $DEFCFG->config['publicinvite']->name = __gettext("Public invitations"); 
    23             $DEFCFG->config['publicinvite']->description = __gettext("Can users of this system invite other users in?"); 
     22            $DEFCFG->config['publicinvite']->name = ("Public invitations"); 
     23            $DEFCFG->config['publicinvite']->description = ("Can users of this system invite other users in?"); 
    2424            $DEFCFG->config['publicinvite']->type = "boolean"; 
    25             $DEFCFG->config['maxusers']->name = __gettext("Maximum users"); 
    26             $DEFCFG->config['maxusers']->description = __gettext("The maximum number of users in your system. If you set this to 0, you will have an unlimited number of users"); 
     25            $DEFCFG->config['maxusers']->name = ("Maximum users"); 
     26            $DEFCFG->config['maxusers']->description = ("The maximum number of users in your system. If you set this to 0, you will have an unlimited number of users"); 
    2727            $DEFCFG->config['maxusers']->type = "integer"; 
    28             $DEFCFG->config['maxspace']->name = __gettext("Maximum disk space"); 
    29             $DEFCFG->config['maxspace']->description = __gettext("The maximum disk space taken up by all uploaded files"); 
     28            $DEFCFG->config['maxspace']->name = ("Maximum disk space"); 
     29            $DEFCFG->config['maxspace']->description = ("The maximum disk space taken up by all uploaded files"); 
    3030            $DEFCFG->config['maxspace']->type = "integer"; 
    31             $DEFCFG->config['walledgarden']->name = __gettext("Walled garden"); 
    32             $DEFCFG->config['walledgarden']->description = __gettext("If your site is a walled garden, nobody can see anything from the outside. This will also mean that RSS feeds won't work"); 
     31            $DEFCFG->config['walledgarden']->name = ("Walled garden"); 
     32            $DEFCFG->config['walledgarden']->description = ("If your site is a walled garden, nobody can see anything from the outside. This will also mean that RSS feeds won't work"); 
    3333            $DEFCFG->config['walledgarden']->type = "boolean"; 
    34             $DEFCFG->config['emailfilter']->name = __gettext("Email filter"); 
    35             $DEFCFG->config['emailfilter']->description = __gettext("Anything you enter here must be present in the email address of anyone who registers; e.g. @mycompany.com will only allow email address from mycompany.com to register"); 
    36             $DEFCFG->config['default_access']->name = __gettext("Default access"); 
    37             $DEFCFG->config['default_access']->description = __gettext("The default access level for all new items in the system"); 
    38             $DEFCFG->config['default_access']->type = __gettext("access"); 
    39             $DEFCFG->config['disable_usertemplates']->name = __gettext("Disable user templates"); 
    40             $DEFCFG->config['disable_usertemplates']->description = __gettext("If this is set, users can only choose from available templates rather than defining their own"); 
     34            $DEFCFG->config['emailfilter']->name = ("Email filter"); 
     35            $DEFCFG->config['emailfilter']->description = ("Anything you enter here must be present in the email address of anyone who registers; e.g. @mycompany.com will only allow email address from mycompany.com to register"); 
     36            $DEFCFG->config['default_access']->name = ("Default access"); 
     37            $DEFCFG->config['default_access']->description = ("The default access level for all new items in the system"); 
     38            $DEFCFG->config['default_access']->type = ("access"); 
     39            $DEFCFG->config['disable_usertemplates']->name = ("Disable user templates"); 
     40            $DEFCFG->config['disable_usertemplates']->description = ("If this is set, users can only choose from available templates rather than defining their own"); 
    4141            $DEFCFG->config['disable_usertemplates']->type = "boolean"; 
    42             $DEFCFG->config['disable_templatechanging']->name = __gettext("Disable template changing"); 
    43             $DEFCFG->config['disable_templatechanging']->description = __gettext("Users cannot change their template at all"); 
     42            $DEFCFG->config['disable_templatechanging']->name = ("Disable template changing"); 
     43            $DEFCFG->config['disable_templatechanging']->description = ("Users cannot change their template at all"); 
    4444            $DEFCFG->config['disable_templatechanging']->type = "boolean"; 
    45             $DEFCFG->config['dbtype']->name = __gettext("Database type"); 
    46             $DEFCFG->config['dbtype']->description = __gettext("Acceptable values are 'mysql' and 'postgres' - MySQL is highly recommended"); 
    47             $DEFCFG->config['dbname']->name = __gettext("Database name"); 
    48             $DEFCFG->config['dbhost']->name = __gettext("Database host"); 
    49             $DEFCFG->config['dbuser']->name = __gettext("Database user"); 
    50             $DEFCFG->config['dbpass']->name = __gettext("Database password"); 
    51             $DEFCFG->config['prefix']->name = __gettext("Database table prefix"); 
    52             $DEFCFG->config['prefix']->description = __gettext("All database tables will start with this; we recommend 'elgg'"); 
    53             $DEFCFG->config['dbpersist']->name = __gettext("Persistent connections"); 
    54             $DEFCFG->config['dbpersist']->description = __gettext("Should Elgg use persistent database connections?"); 
     45            $DEFCFG->config['dbtype']->name = ("Database type"); 
     46            $DEFCFG->config['dbtype']->description = ("Acceptable values are 'mysql' and 'postgres' - MySQL is highly recommended"); 
     47            $DEFCFG->config['dbname']->name = ("Database name"); 
     48            $DEFCFG->config['dbhost']->name = ("Database host"); 
     49            $DEFCFG->config['dbuser']->name = ("Database user"); 
     50            $DEFCFG->config['dbpass']->name = ("Database password"); 
     51            $DEFCFG->config['prefix']->name = ("Database table prefix"); 
     52            $DEFCFG->config['prefix']->description = ("All database tables will start with this; we recommend 'elgg'"); 
     53            $DEFCFG->config['dbpersist']->name = ("Persistent connections"); 
     54            $DEFCFG->config['dbpersist']->description = ("Should Elgg use persistent database connections?"); 
    5555            $DEFCFG->config['dbpersist']->type = "boolean"; 
    56             $DEFCFG->config['debug']->name = __gettext("Debug"); 
    57             $DEFCFG->config['debug']->description = __gettext("Set this to 2047 to get adodb error handling"); 
     56            $DEFCFG->config['debug']->name = ("Debug"); 
     57            $DEFCFG->config['debug']->description = ("Set this to 2047 to get adodb error handling"); 
    5858            $DEFCFG->config['debug']->type = "integer"; 
    59             $DEFCFG->config['rsspostsmaxage']->name = __gettext("RSS posts maximum age"); 
    60             $DEFCFG->config['rsspostsmaxage']->description = __gettext("Number of days to keep incoming RSS feed entries for before deleting them"); 
     59            $DEFCFG->config['rsspostsmaxage']->name = ("RSS posts maximum age"); 
     60            $DEFCFG->config['rsspostsmaxage']->description = ("Number of days to keep incoming RSS feed entries for before deleting them"); 
    6161            $DEFCFG->config['rsspostsmaxage']->type = "integer"; 
    62             $DEFCFG->config['adminuser']->name = __gettext("Admin username"); 
    63             $DEFCFG->config['adminuser']->description = __gettext("Username to log into this admin panel"); 
     62            $DEFCFG->config['adminuser']->name = ("Admin username"); 
     63            $DEFCFG->config['adminuser']->description = ("Username to log into this admin panel"); 
    6464            $DEFCFG->config['adminuser']->type = "requiredstring"; 
    65             $DEFCFG->config['adminpassword']->name = __gettext("Admin password"); 
    66             $DEFCFG->config['adminpassword']->description = __gettext("Password to log into this admin panel"); 
     65            $DEFCFG->config['adminpassword']->name = ("Admin password"); 
     66            $DEFCFG->config['adminpassword']->description = ("Password to log into this admin panel"); 
    6767            $DEFCFG->config['adminpassword']->type = "requiredstring"; 
    68             $DEFCFG->config['templatesroot']->name = __gettext("Templates location"); 
    69             $DEFCFG->config['templatesroot']->description = __gettext("The location of your Default_Template directory"); 
     68            $DEFCFG->config['templatesroot']->name = ("Templates location"); 
     69            $DEFCFG->config['templatesroot']->description = ("The location of your Default_Template directory"); 
    7070             
    7171?> 
  • devel/_elggadmin/frontpage.php

    r659 r756  
    2626        echo "</td><td valign=\"top\" width=\"200\" >"; 
    2727         
    28         echo "<h2>" . __gettext("Special keywords") . "</h2>"; 
     28        echo "<h2>" . ("Special keywords") . "</h2>"; 
    2929        echo "<p>&nbsp;</p>"; 
    30         echo "<p>" . __gettext("You can insert these into your pageshell for special functionality:") . "</p>"; 
    31         echo "<p><b>{{url}}</b> " . __gettext("The address of your site.") . "</p>"; 
    32         echo "<p><b>{{sitename}}</b> " . __gettext("The name of your site.") . "</p>"; 
    33         echo "<p><b>{{tagline}}</b> " . __gettext("Your site's tagline.") . "</p>"; 
    34         echo "<p><b>{{username}}</b> " . __gettext("The current user's username.") . "</p>"; 
    35         echo "<p><b>{{userfullname}}</b> " . __gettext("The current user's full name.") . "</p>"; 
    36         echo "<p><b>{{populartags}}</b> " . __gettext("A list of the most popular tags.") . "</p>"; 
    37         echo "<p><b>{{randomusers}}</b> " . __gettext("A list of random users who have filled in their profiles, if some exist.") . "</p>"; 
    38         echo "<p><b>{{people:interests:foo:5}}</b> " . __gettext("Lists five people interested in 'foo' in a horizontal table.") . "</p>"; 
    39         echo "<p><b>{{toptags:town}}</b> " . __gettext("Lists the top tags of type 'town' (or select weblog, file or the profile field of your choice).") . "</p>"; 
     30        echo "<p>" . ("You can insert these into your pageshell for special functionality:") . "</p>"; 
     31        echo "<p><b>{{url}}</b> " . ("The address of your site.") . "</p>"; 
     32        echo "<p><b>{{sitename}}</b> " . ("The name of your site.") . "</p>"; 
     33        echo "<p><b>{{tagline}}</b> " . ("Your site's tagline.") . "</p>"; 
     34        echo "<p><b>{{username}}</b> " . ("The current user's username.") . "</p>"; 
     35        echo "<p><b>{{userfullname}}</b> " . ("The current user's full name.") . "</p>"; 
     36        echo "<p><b>{{populartags}}</b> " . ("A list of the most popular tags.") . "</p>"; 
     37        echo "<p><b>{{randomusers}}</b> " . ("A list of random users who have filled in their profiles, if some exist.") . "</p>"; 
     38        echo "<p><b>{{people:interests:foo:5}}</b> " . ("Lists five people interested in 'foo' in a horizontal table.") . "</p>"; 
     39        echo "<p><b>{{toptags:town}}</b> " . ("Lists the top tags of type 'town' (or select weblog, file or the profile field of your choice).") . "</p>"; 
    4040         
    4141        echo "</td></tr></table>"; 
  • devel/_elggadmin/lib.php

    r687 r756  
    121121                            $_SESSION['adminid'] = 1; 
    122122                            $_SESSION['admincode'] = md5($CFG->adminuser . $CFG->adminpassword); 
    123                             $messages[] = __gettext("You logged in."); 
     123                            $messages[] = ("You logged in."); 
    124124                            $_SESSION['messages'] = $messages; 
    125125                            header("Location: index.php"); 
     
    127127                             
    128128                        } else { 
    129                             $messages[] = __gettext("The username and password you specified did not match the admin details for this system."); 
     129                            $messages[] = ("The username and password you specified did not match the admin details for this system."); 
    130130                        } 
    131131                     
     
    185185                                                $selected[$CFG->$name] = "selected=\"selected\""; 
    186186                                                echo "<select name=\"$name\">"; 
    187                                                 echo "<option value=\"PUBLIC\" {$selected['PUBLIC']}>" . __gettext("Public") . "</option>"; 
    188                                                 echo "<option value=\"LOGGED_IN\" {$selected['LOGGED_IN']} >" . __gettext("Logged in users only") . "</option>"; 
    189                                                 echo "<option value=\"PRIVATE\" {$selected['PRIVATE']} >" . __gettext("Private") . "</option>"; 
     187                                                echo "<option value=\"PUBLIC\" {$selected['PUBLIC']}>" . ("Public") . "</option>"; 
     188                                                echo "<option value=\"LOGGED_IN\" {$selected['LOGGED_IN']} >" . ("Logged in users only") . "</option>"; 
     189                                                echo "<option value=\"PRIVATE\" {$selected['PRIVATE']} >" . ("Private") . "</option>"; 
    190190                                                echo "</select>"; 
    191191                                                break; 
     
    199199                                                } 
    200200                                                echo "<select name=\"$name\">"; 
    201                                                 echo "<option value=\"0\" {$selected['no']}>" . __gettext("No") . "</option>"; 
    202                                                 echo "<option value=\"1\" {$selected['yes']} >" . __gettext("Yes") . "</option>"; 
     201                                                echo "<option value=\"0\" {$selected['no']}>" . ("No") . "</option>"; 
     202                                                echo "<option value=\"1\" {$selected['yes']} >" . ("Yes") . "</option>"; 
    203203                                                echo "</select>"; 
    204204                                                break; 
     
    214214            } 
    215215             
    216             echo "<p>&nbsp;</p><p><i>" . __gettext("Click below to save your settings.") . "</i></p>"; 
    217             echo "<p><input type=\"hidden\" value=\"config:save\" name=\"action\" /><input type=\"submit\" value=\"" . __gettext("Save") . "\" /></p>"; 
     216            echo "<p>&nbsp;</p><p><i>" . ("Click below to save your settings.") . "</i></p>"; 
     217            echo "<p><input type=\"hidden\" value=\"config:save\" name=\"action\" /><input type=\"submit\" value=\"" . ("Save") . "\" /></p>"; 
    218218            echo "</form>"; 
    219219        } 
     
    222222        function elggadmin_config_save() { 
    223223             
    224             global $CFG, $ADMINCFG, $PARSEDCFG, $messages; 
     224            global $CFG, $ADMINCFG, $PARSEDCFG, $DEFCFG, $messages; 
    225225             
    226226            $oktosave = 1; 
     
    238238                    } 
    239239                } 
    240                         if (isset($ADMINCFG->config[$name]->type)) { 
     240                        if (isset($DEFCFG->config[$name]->type)) { 
    241241                             
    242                             switch ($ADMINCFG->config[$name]->type) { 
     242                            switch ($DEFCFG->config[$name]->type) { 
    243243                                 
    244244                                case "int": 
    245245                                            if (empty($CFG->$name)) { 
    246                                                 $CFG->$name = 0
     246                                                $CFG->$name = "0"
    247247                                            } 
    248248                                            $CFG->$name = (int) $CFG->$name; 
     
    250250                                case "boolean": 
    251251                                            if (empty($CFG->$name)) { 
    252                                                 $CFG->$name = 0
     252                                                $CFG->$name = "0"
    253253                                            } 
    254254                                            $CFG->$name = (int) $CFG->$name; 
    255255                                            if ($CFG->$name > 1) { 
    256                                                 $CFG->$name = 1
     256                                                $CFG->$name = "1"
    257257                                            } 
    258258                                            break; 
     
    260260                                            if (empty($CFG->$name)) { 
    261261                                                $oktosave = 0; 
    262                                                 $messages[] = sprintf(__gettext("You cannot leave '%s' blank!"),$ADMINCFG->config[$name]->name); 
     262                                                $messages[] = sprintf(("You cannot leave '%s' blank!"),$ADMINCFG->config[$name]->name); 
    263263                                            } 
    264264                                            break; 
     
    280280                $newconfigfile = elggadmin_configstring(); 
    281281                if (!@file_put_contents($ADMINCFG->admin->elggdir . $ADMINCFG->admin->configfile, $newconfigfile)) { 
    282                     $messages[] = sprintf(__gettext("We couldn't write your new configuration to your configuration file at %s. Therefore, please copy everything from the textbox below and paste it into a new file called %s in %s."),$ADMINCFG->admin->elggdir . $ADMINCFG->admin->configfile,$ADMINCFG->admin->configfile,$ADMINCFG->admin->elggdir . $ADMINCFG->admin->configfile) . "<br />" . "<textarea cols=\"40\" rows=\"6\">" . $newconfigfile . "</textarea>"; 
     282                    $messages[] = sprintf(("We couldn't write your new configuration to your configuration file at %s. Therefore, please copy everything from the textbox below and paste it into a new file called %s in %s."),$ADMINCFG->admin->elggdir . $ADMINCFG->admin->configfile,$ADMINCFG->admin->configfile,$ADMINCFG->admin->elggdir . $ADMINCFG->admin->configfile) . "<br />" . "<textarea cols=\"40\" rows=\"6\">" . $newconfigfile . "</textarea>"; 
    283283                } else { 
    284                     $messages[] = __gettext("Your new configuration was saved."); 
     284                    $messages[] = ("Your new configuration was saved."); 
    285285                } 
    286286                 
     
    319319            if (!is_writable($CFG->templatesroot . "Default_Template/pageshell") 
    320320                || !is_writable($CFG->templatesroot . "Default_Template/css")) {                     
    321                     $messages[] = sprintf(__gettext("The administration panel can't write to the theme. You will need to edit your theme files directly or specify that %s is world-writable."),$CFG->templatesroot . "Default_Template/"); 
     321                    $messages[] = sprintf(("The administration panel can't write to the theme. You will need to edit your theme files directly or specify that %s is world-writable."),$CFG->templatesroot . "Default_Template/"); 
    322322                } 
    323323                 
     
    338338            if (!is_writable($CFG->templatesroot . "Default_Template/frontpage_loggedin") 
    339339                || !is_writable($CFG->templatesroot . "Default_Template/frontpage_loggedout")) {                     
    340                     $messages[] = sprintf(__gettext("The administration panel can't write to the front page template. You will need to edit your front page files directly or specify that %s is world-writable."),$CFG->templatesroot . "Default_Template/"); 
     340                    $messages[] = sprintf(("The administration panel can't write to the front page template. You will need to edit your front page files directly or specify that %s is world-writable."),$CFG->templatesroot . "Default_Template/"); 
    341341                } 
    342342                 
     
    349349             
    350350            if (!@copy($CFG->templatesroot . "Default_Template/pageshell", $CFG->dataroot . "backuppageshell")) { 
    351                 $messages[] = __gettext("Could not backup pageshell."); 
     351                $messages[] = ("Could not backup pageshell."); 
    352352            } 
    353353            if (!@copy($CFG->templatesroot . "Default_Template/css", $CFG->dataroot . "backupcss")) { 
    354                 $messages[] = __gettext("Could not backup css."); 
     354                $messages[] = ("Could not backup css."); 
    355355            } 
    356356                     
     
    363363             
    364364            if (!@copy($CFG->dataroot . "backuppageshell", $CFG->templatesroot . "Default_Template/pageshell")) { 
    365                 $messages[] = __gettext("Could not restore pageshell backup."); 
     365                $messages[] = ("Could not restore pageshell backup."); 
    366366            } 
    367367            if (!@copy($CFG->dataroot . "backupcss", $CFG->templatesroot . "Default_Template/css")) { 
    368                 $messages[] = __gettext("Could not restore css backup."); 
     368                $messages[] = ("Could not restore css backup."); 
    369369            } 
    370370                     
     
    389389                     
    390390                    if (!@file_put_contents($CFG->templatesroot . "Default_Template/pageshell",$pageshell)) { 
    391                         $messages[] = __gettext("Could not save pageshell."); 
     391                        $messages[] = ("Could not save pageshell."); 
    392392                    } else { 
    393                         $messages[] = __gettext("Pageshell saved."); 
     393                        $messages[] = ("Pageshell saved."); 
    394394                    } 
    395395                    if (!@file_put_contents($CFG->templatesroot . "Default_Template/css",$css)) { 
    396                         $messages[] = __gettext("Could not save CSS."); 
     396                        $messages[] = ("Could not save CSS."); 
    397397                    } else { 
    398                         $messages[] = __gettext("CSS saved."); 
     398                        $messages[] = ("CSS saved."); 
    399399                    } 
    400400                 
    401401                } else { 
    402402                     
    403                     $messages[] = sprintf(__gettext("The admin panel doesn't have the right to save to pageshell and css at %s. You may wish to speak to your system administrator about granting write access to those files."),$CFG->templatesroot . "Default_Template/"); 
     403                    $messages[] = sprintf(("The admin panel doesn't have the right to save to pageshell and css at %s. You may wish to speak to your system administrator about granting write access to those files."),$CFG->templatesroot . "Default_Template/"); 
    404404                     
    405405                } 
     
    431431                     
    432432                    if (!@file_put_contents($CFG->templatesroot . "Default_Template/frontpage_loggedout",$frontpage_loggedout)) { 
    433                         $messages[] = __gettext("Could not save frontpage_loggedout."); 
     433                        $messages[] = ("Could not save frontpage_loggedout."); 
    434434                    } else { 
    435                         $messages[] = __gettext("frontpage_loggedout saved."); 
     435                        $messages[] = ("frontpage_loggedout saved."); 
    436436                    } 
    437437                    if (!@file_put_contents($CFG->templatesroot . "Default_Template/frontpage_loggedin",$frontpage_loggedin)) { 
    438                         $messages[] = __gettext("Could not save frontpage_loggedin."); 
     438                        $messages[] = ("Could not save frontpage_loggedin."); 
    439439                    } else { 
    440                         $messages[] = __gettext("frontpage_loggedin saved."); 
     440                        $messages[] = ("frontpage_loggedin saved."); 
    441441                    } 
    442442                 
    443443                } else { 
    444444                     
    445                     $messages[] = sprintf(__gettext("The admin panel doesn't have the right to save to frontpage_loggedout and frontpage_loggedin at %s. You may wish to speak to your system administrator about granting write access to those files."),$CFG->templatesroot . "Default_Template/"); 
     445                    $messages[] = sprintf(("The admin panel doesn't have the right to save to frontpage_loggedout and frontpage_loggedin at %s. You may wish to speak to your system administrator about granting write access to those files."),$CFG->templatesroot . "Default_Template/"); 
    446446                     
    447447                } 
     
    462462            echo "<form action=\"\" method=\"post\">"; 
    463463             
    464             echo "<p><b>" . __gettext("Main pageshell") . "</b></p>"; 
     464            echo "<p><b>" . ("Main pageshell") . "</b></p>"; 
    465465             
    466466            echo "<textarea name=\"pageshell\" >"; 
     
    468468            echo "</textarea>"; 
    469469             
    470             echo "<p><b>" . __gettext("CSS styles") . "</b></p>"; 
     470            echo "<p><b>" . ("CSS styles") . "</b></p>"; 
    471471             
    472472            echo "<textarea name=\"css\" >"; 
     
    474474            echo "</textarea>"; 
    475475             
    476             echo "<p>&nbsp;</p><p><i>" . __gettext("Click below to save your settings.") . "</i></p>"; 
    477             echo "<p><input type=\"hidden\" value=\"theme:save\" name=\"action\" /><input type=\"submit\" value=\"" . __gettext("Save") . "\" /></p>"; 
     476            echo "<p>&nbsp;</p><p><i>" . ("Click below to save your settings.") . "</i></p>"; 
     477            echo "<p><input type=\"hidden\" value=\"theme:save\" name=\"action\" /><input type=\"submit\" value=\"" . ("Save") . "\" /></p>"; 
    478478            echo "</form>"; 
    479479             
    480480            echo "<form action=\"\" method=\"post\">"; 
    481             echo "<p><i>" . __gettext("Only press the button below if you're sure this theme works!") . "</i></p>"; 
    482             echo "<p><input type=\"hidden\" value=\"theme:backup:save\" name=\"action\" /><input type=\"submit\" value=\"" . __gettext("Save a backup") . "\" /></p>"; 
     481            echo "<p><i>" . ("Only press the button below if you're sure this theme works!") . "</i></p>"; 
     482            echo "<p><input type=\"hidden\" value=\"theme:backup:save\" name=\"action\" /><input type=\"submit\" value=\"" . ("Save a backup") . "\" /></p>"; 
    483483            echo "</form>"; 
    484484             
     
    486486                 
    487487                echo "<form action=\"\" method=\"post\">"; 
    488                 echo "<p><i>" . __gettext("Click to restore your last saved backup:") . "</i></p>"; 
    489                 echo "<p><input type=\"hidden\" value=\"theme:backup:restore\" name=\"action\" /><input type=\"submit\" value=\"" . __gettext("Restore from backup") . "\" /></p>"; 
     488                echo "<p><i>" . ("Click to restore your last saved backup:") . "</i></p>"; 
     489                echo "<p><input type=\"hidden\" value=\"theme:backup:restore\" name=\"action\" /><input type=\"submit\" value=\"" . ("Restore from backup") . "\" /></p>"; 
    490490                echo "</form>"; 
    491491                 
     
    501501            echo "<form action=\"\" method=\"post\">"; 
    502502             
    503             echo "<p><b>" . __gettext("Front page (when logged out)") . "</b></p>"; 
     503            echo "<p><b>" . ("Front page (when logged out)") . "</b></p>"; 
    504504             
    505505            echo "<textarea name=\"frontpage_loggedout\" >"; 
     
    507507            echo "</textarea>"; 
    508508             
    509             echo "<p><b>" . __gettext("Front page (when logged in)") . "</b></p>"; 
     509            echo "<p><b>" . ("Front page (when logged in)") . "</b></p>"; 
    510510             
    511511            echo "<textarea name=\"frontpage_loggedin\" >"; 
     
    513513            echo "</textarea>"; 
    514514             
    515             echo "<p>&nbsp;</p><p><i>" . __gettext("Click below to save your settings.") . "</i></p>"; 
    516             echo "<p><input type=\"hidden\" value=\"frontpage:save\" name=\"action\" /><input type=\"submit\" value=\"" . __gettext("Save") . "\" /></p>"; 
     515            echo "<p>&nbsp;</p><p><i>" . ("Click below to save your settings.") . "</i></p>"; 
     516            echo "<p><input type=\"hidden\" value=\"frontpage:save\" name=\"action\" /><input type=\"submit\" value=\"" . ("Save") . "\" /></p>"; 
    517517            echo "</form>"; 
    518518             
     
    571571            if (!empty($CFG->adminuser) && !empty($CFG->adminpassword)) { 
    572572                 
    573                 echo "<h1>" . __gettext("Please log in") . "</h1>"; 
    574                 echo "<p>" . __gettext("Log in with your admin username and password below.") . "</p>"; 
     573                echo "<h1>" . ("Please log in") . "</h1>"; 
     574                echo "<p>" . ("Log in with your admin username and password below.") . "</p>"; 
    575575                echo "<form action=\"\" method=\"post\">\n"; 
    576576                echo "<table border=\"0\">\n"; 
    577                 echo "<tr><td><p>" . __gettext("Username:") . "</p></td><td><p><input type=\"text\" name=\"adminuser\" value=\"\" /></p></td></tr>\n"; 
    578                 echo "<tr><td><p>" . __gettext("Password:") . "</p></td><td><p><input type=\"password\" name=\"adminpassword\" value=\"\" /></p></td></tr>\n"; 
    579                 echo "<tr><td colspan=\"2\"><p><input type=\"hidden\" name=\"action\" value=\"admin:login\" /><input type=\"submit\" value=\"" . __gettext("Log in") . "\" /></p></td></tr>\n"; 
     577                echo "<tr><td><p>" . ("Username:") . "</p></td><td><p><input type=\"text\" name=\"adminuser\" value=\"\" /></p></td></tr>\n"; 
     578                echo "<tr><td><p>" . ("Password:") . "</p></td><td><p><input type=\"password\" name=\"adminpassword\" value=\"\" /></p></td></tr>\n"; 
     579                echo "<tr><td colspan=\"2\"><p><input type=\"hidden\" name=\"action\" value=\"admin:login\" /><input type=\"submit\" value=\"" . ("Log in") . "\" /></p></td></tr>\n"; 
    580580                echo "</table>\n"; 
    581581                 
    582582            } else { 
    583583                 
    584                 echo "<h1>" . __gettext("Admin login not defined") . "</h1>"; 
    585                 echo "<p>" . __gettext("Before you use the admin panel, you will need to add the following code to Elgg's config.php:") . "</p>"; 
     584                echo "<h1>" . ("Admin login not defined") . "</h1>"; 
     585                echo "<p>" . ("Before you use the admin panel, you will need to add the following code to Elgg's config.php:") . "</p>"; 
    586586                echo "<textarea rows=\"4\" cols=\"40\">\n\n\$CFG->adminuser = '';\n\$CFG->adminpassword = '';</textarea>"; 
    587                 echo "<p>" . __gettext("The values for \$CFG->adminuser and \$CFG->adminpassword cannot be left blank.") . "</p>"; 
     587                echo "<p>" . ("The values for \$CFG->adminuser and \$CFG->adminpassword cannot be left blank.") . "</p>"; 
    588588                 
    589589            } 
  • devel/_elggadmin/plugins.php

    r659 r756  
    1919        elggadmin_begin_content(); 
    2020         
    21         echo "<p>" . __gettext("Be patient! This functionality is coming soon.") . "</p>"; 
     21        echo "<p>" . ("Be patient! This functionality is coming soon.") . "</p>"; 
    2222         
    2323        elggadmin_end_content(); 
  • devel/_elggadmin/profile.php

    r659 r756  
    1919        elggadmin_begin_content(); 
    2020         
    21         echo "<p>" . __gettext("Be patient! This functionality is coming soon.") . "</p>"; 
     21        echo "<p>" . ("Be patient! This functionality is coming soon.") . "</p>"; 
    2222         
    2323        elggadmin_end_content(); 
  • devel/_elggadmin/theme.php

    r659 r756  
    2626        echo "</td><td valign=\"top\" width=\"200\" >"; 
    2727         
    28         echo "<h2>" . __gettext("Special keywords") . "</h2>"; 
     28        echo "<h2>" . ("Special keywords") . "</h2>"; 
    2929        echo "<p>&nbsp;</p>"; 
    30         echo "<p>" . __gettext("You can insert these into your pageshell for special functionality:") . "</p>"; 
    31         echo "<p><b>{{url}}</b> " . __gettext("The address of your site.") . "</p>"; 
    32         echo "<p><b>{{sitename}}</b> " . __gettext("The name of your site.") . "</p>"; 
    33         echo "<p><b>{{tagline}}</b> " . __gettext("Your site's tagline.") . "</p>"; 
    34         echo "<p><b>{{title}}</b> " . __gettext("The page title.") . "</p>"; 
    35         echo "<p><b>{{topmenu}}</b> " . __gettext("The top menu.") . "</p>"; 
    36         echo "<p><b>{{messageshell}}</b> " . __gettext("Any system messages.") . "</p>"; 
    37         echo "<p><b>{{menu}}</b> " . __gettext("The main menu.") . "</p>"; 
    38         echo "<p><b>{{mainbody}}</b> " . __gettext("The main body of the page.") . "</p>"; 
    39         echo "<p><b>{{sidebar}}</b> " . __gettext("The page sidebar.") . "</p>"; 
     30        echo "<p>" . ("You can insert these into your pageshell for special functionality:") . "</p>"; 
     31        echo "<p><b>{{url}}</b> " . ("The address of your site.") . "</p>"; 
     32        echo "<p><b>{{sitename}}</b> " . ("The name of your site.") . "</p>"; 
     33        echo "<p><b>{{tagline}}</b> " . ("Your site's tagline.") . "</p>"; 
     34        echo "<p><b>{{title}}</b> " . ("The page title.") . "</p>"; 
     35        echo "<p><b>{{topmenu}}</b> " . ("The top menu.") . "</p>"; 
     36        echo "<p><b>{{messageshell}}</b> " . ("Any system messages.") . "</p>"; 
     37        echo "<p><b>{{menu}}</b> " . ("The main menu.") . "</p>"; 
     38        echo "<p><b>{{mainbody}}</b> " . ("The main body of the page.") . "</p>"; 
     39        echo "<p><b>{{sidebar}}</b> " . ("The page sidebar.") . "</p>"; 
    4040         
    4141        echo "</td></tr></table>";