diff --git a/framework/core/expFramework.php b/framework/core/expFramework.php index 15c2706e17..fae383a825 100755 --- a/framework/core/expFramework.php +++ b/framework/core/expFramework.php @@ -253,7 +253,7 @@ function hotspot($source = null) { if (!empty($source)) { global $sectionObj; //FIXME there is NO 'page' object - $page = new page($sectionObj->id); + $page = new section($sectionObj->id); $modules = $page->getModulesBySource($source); //eDebug($modules);exit(); diff --git a/framework/core/lang/English - US.php b/framework/core/lang/English - US.php index 71c807f62b..41c180fd47 100755 --- a/framework/core/lang/English - US.php +++ b/framework/core/lang/English - US.php @@ -1,27 +1,29 @@ "A CAPTCHA (Computer Automated Public Turing Test to Tell Computers and Humans Apart) is a means to prevent massive account registration. When registering a new user account, the visitor will be required to enter a series of letters and numbers appearing in an image. This prevents scripted bots from registering a large quantity of accounts.", - "A description of what the site is about."=>"A description of what the site is about.", - "A message to display to all non-administrators visiting the site."=>"A message to display to all non-administrators visiting the site.", - "A prefix to prepend to all table names."=>"A prefix to prepend to all table names.", "A table prefix helps Exponent differentiate tables for this site from other tables that may already exist (or eventually be created by other scripts). If you are using an existing database, you may want to change this."=>"A table prefix helps Exponent differentiate tables for this site from other tables that may already exist (or eventually be created by other scripts). If you are using an existing database, you may want to change this.", "A table prefix may only contain numbers and letters. Spaces and symbols (including \'_\') are not allowed. An underscore will be added for you, by Exponent."=>"A table prefix may only contain numbers and letters. Spaces and symbols (including \'_\') are not allowed. An underscore will be added for you, by Exponent.", + "About ExponentCMS"=>"About ExponentCMS", + "Action"=>"Action", + "Active"=>"Active", "Add Configuration Settings"=>"Add Configuration Settings", "Add Module"=>"Add Module", + "Add a news post"=>"Add a news post", "Add text at the top"=>"Add text at the top", "Address"=>"Address", "Administrator"=>"Administrator", + "Advertise all RSS Feeds to Web Browsers?"=>"Advertise all RSS Feeds to Web Browsers?", "All Caches were cleared."=>"All Caches were cleared.", + "All Comments Must be Approved?"=>"All Comments Must be Approved?", "All database server software supported by Exponent require some sort of authentication. Enter the name of the user account to use for logging into the database server."=>"All database server software supported by Exponent require some sort of authentication. Enter the name of the user account to use for logging into the database server.", - "Allow Registration?"=>"Allow Registration?", - "An email notification will be sent to the email address specificed below to notify you of new comments on your site."=>"An email notification will be sent to the email address specificed below to notify you of new comments on your site.", - "An email notification will be sent to the email address specificed below to notify you of new notes."=>"An email notification will be sent to the email address specificed below to notify you of new notes.", + "Anti-Spam"=>"Anti-Spam", "Anti-Spam Measures"=>"Anti-Spam Measures", - "Attribution"=>"Attribution", + "Anti-Spam Method"=>"Anti-Spam Method", + "Attribution Display"=>"Attribution Display", "Backend"=>"Backend", - "Backend Software"=>"Backend Software", - "Base DN"=>"Base DN", "Begin Installation in Selected Language"=>"Begin Installation in Selected Language", + "CKEditor Toolbar Manager"=>"CKEditor Toolbar Manager", + "Cancel"=>"Cancel", + "Change My Password"=>"Change My Password", "Checking ALTER TABLE privilege"=>"Checking ALTER TABLE privilege", "Checking CREATE TABLE privilege"=>"Checking CREATE TABLE privilege", "Checking DELETE privilege"=>"Checking DELETE privilege", @@ -30,335 +32,325 @@ "Checking INSERT privilege"=>"Checking INSERT privilege", "Checking SELECT privilege"=>"Checking SELECT privilege", "Checking UPDATE privilege"=>"Checking UPDATE privilege", - "Checking this option will cause Exponent to try to authenticate to the ldap server listed below."=>"Checking this option will cause Exponent to try to authenticate to the ldap server listed below.", - "Checking this option will force user to create an account and be logged in before they can addn notes. Theoreticall this will rarely be an issue as simple notes are generall added to edit forms (products for example) and thus the user would need to be logged in anyway."=>"Checking this option will force user to create an account and be logged in before they can addn notes. Theoreticall this will rarely be an issue as simple notes are generall added to edit forms (products for example) and thus the user would need to be logged in anyway.", - "Checking this option will force user to create an account and be logged in before they can post comments on your site."=>"Checking this option will force user to create an account and be logged in before they can post comments on your site.", - "Choose an Anti-Spam Control"=>"Choose an Anti-Spam Control", - "Choose the HTML editor to use as the default editor for this site."=>"Choose the HTML editor to use as the default editor for this site.", + "Clear All Caches"=>"Clear All Caches", + "Clear CSS/Minify Cache"=>"Clear CSS/Minify Cache", + "Clear Image Cache"=>"Clear Image Cache", + "Clear RSS/Podcast Cache"=>"Clear RSS/Podcast Cache", + "Clear Smarty Cache"=>"Clear Smarty Cache", "Clear the Caches"=>"Clear the Caches", + "Comment Policies"=>"Comment Policies", + "Configuration"=>"Configuration", "Configure Action & View"=>"Configure Action & View", "Configure Database"=>"Configure Database", - "Configure Editor Toolbar"=>"Configure Editor Toolbar", + "Configure Migration Settings"=>"Configure Migration Settings", "Configure Settings"=>"Configure Settings", + "Configure Website"=>"Configure Website", "Configure Your Database"=>"Configure Your Database", + "Configuring Toolbars"=>"Configuring Toolbars", "Connecting"=>"Connecting", + "Content of email sent to the user upon completing registration"=>"Content of email sent to the user upon completing registration", "Continue Installation"=>"Continue Installation", "Continue Upgrade"=>"Continue Upgrade", "Continue to Install Tables"=>"Continue to Install Tables", "Create Administrator"=>"Create Administrator", - "Create an Administrator"=>"Create an Administrator", + "Create New Configuration"=>"Create New Configuration", + "Create a New User"=>"Create a New User", + "Custom Plugins"=>"Custom Plugins", + "Database"=>"Database", "Database Backend"=>"Database Backend", - "Database Connection Encoding"=>"Database Connection Encoding", "Database Encoding"=>"Database Encoding", "Database Name"=>"Database Name", - "Database Options"=>"Database Options", "Database tests passed."=>"Database tests passed.", "Date Format"=>"Date Format", - "Date and Time Format"=>"Date and Time Format", + "Date/Time Format"=>"Date/Time Format", + "Default"=>"Default", "Default Directory Permissions"=>"Default Directory Permissions", "Default File Permissions"=>"Default File Permissions", - "Default Section"=>"Default Section", - "Default day to start the week."=>"Default day to start the week.", - "Default system-wide date format, displaying both date and time."=>"Default system-wide date format, displaying both date and time.", - "Default system-wide date format, displaying date only."=>"Default system-wide date format, displaying date only.", - "Default system-wide date format, displaying time only."=>"Default system-wide date format, displaying time only.", - "Default timezone for this site."=>"Default timezone for this site.", + "Default Section (Home Page)"=>"Default Section (Home Page)", + "Default timezone for this site
CAUTION: This may break calendars and other features that use date functions if you change this after entering data."=>"Default timezone for this site
CAUTION: This may break calendars and other features that use date functions if you change this after entering data.", "Description"=>"Description", + "Developer Tools"=>"Developer Tools", + "Display"=>"Display", "Display Settings"=>"Display Settings", "Don\'t change that unless you know what you are doing."=>"Don\'t change that unless you know what you are doing.", + "Edit My Profile"=>"Edit My Profile", "Edit Text"=>"Edit Text", - "Edit Your Database Settings"=>"Edit Your Database Settings", + "Edit this page"=>"Edit this page", "Either an IP address (like 1.2.3.4) or an internet domain name (such as example.com) will work."=>"Either an IP address (like 1.2.3.4) or an internet domain name (such as example.com) will work.", + "Either we weren\'t able to log in or "=>"Either we weren\'t able to log in or ", "Email Address"=>"Email Address", - "Enable Error Reporting"=>"Enable Error Reporting", - "Enable SEF URLs"=>"Enable SEF URLs", - "Enable SSL Support"=>"Enable SSL Support", + "Email address of administrator that should be notified when a user signs up"=>"Email address of administrator that should be notified when a user signs up", + "Email address(es) that should be notified of New Comments
(Enter multiple addresses by using a comma to separate them)"=>"Email address(es) that should be notified of New Comments
(Enter multiple addresses by using a comma to separate them)", + "Enable Help links for documentation?"=>"Enable Help links for documentation?", + "Enable SSL Support?"=>"Enable SSL Support?", "Enable Search Engine Friendly URLs"=>"Enable Search Engine Friendly URLs", - "Enable Session Timeout"=>"Enable Session Timeout", - "Enable User Tracking"=>"Enable User Tracking", - "Enabling SEF URLs will make your URL strings easier to read and more attractive to the search engines."=>"Enabling SEF URLs will make your URL strings easier to read and more attractive to the search engines.", - "Enabling user tracking will allow you to view detailed statistics about what users are doing on your site. Performance penalties may be incurred for enabling this. If you don\'t know what it is, or don\'t need it, don\'t enable it."=>"Enabling user tracking will allow you to view detailed statistics about what users are doing on your site. Performance penalties may be incurred for enabling this. If you don\'t know what it is, or don\'t need it, don\'t enable it.", - "Enter the Base context for this LDAP connection."=>"Enter the Base context for this LDAP connection.", - "Enter the email address you would like new user notification to go to."=>"Enter the email address you would like new user notification to go to.", - "Enter the hostname or IP of the LDAP server."=>"Enter the hostname or IP of the LDAP server.", + "Enable Session Timeout?"=>"Enable Session Timeout?", + "Enable logging of minify error messages to FirePHP?"=>"Enable logging of minify error messages to FirePHP?", + "Enter Maintenance Mode?"=>"Enter Maintenance Mode?", "Enter the password for the username you entered above. The password will"=>"Enter the password for the username you entered above. The password will", - "Enter the password for the username/context listed above."=>"Enter the password for the username/context listed above.", "Error Messages"=>"Error Messages", + "Existing"=>"Existing", "Exponent Install Wizard"=>"Exponent Install Wizard", + "Exponent Version"=>"Exponent Version", "Exponent is now checking to make sure that the database configuration information you provided is valid."=>"Exponent is now checking to make sure that the database configuration information you provided is valid.", "Exponent requires a database to store and manage content. "=>"Exponent requires a database to store and manage content. ", "Exponent requires that several file permissions be set correctly in order to operate. "=>"Exponent requires that several file permissions be set correctly in order to operate. ", "Exponent will perform the following upgrades:"=>"Exponent will perform the following upgrades:", - "Failed"=>"Failed", + "Export Data"=>"Export Data", + "Extensions"=>"Extensions", + "File Manager"=>"File Manager", "File Uploads Enabled"=>"File Uploads Enabled", "File and Directory Permission Tests"=>"File and Directory Permission Tests", + "Files"=>"Files", "Finish Upgrade"=>"Finish Upgrade", "First Name"=>"First Name", - "Force Display of the Mobile Theme Variation (if available)"=>"Force Display of the Mobile Theme Variation (if available)", - "Force the Display of the Mobile Theme Variation for Development (if available)"=>"Force the Display of the Mobile Theme Variation for Development (if available)", + "Force Display of the Mobile Theme Variation (if available)?"=>"Force Display of the Mobile Theme Variation (if available)?", "From Address"=>"From Address", - "Full URL of the website with SSL support (usually starting with \'https://\')"=>"Full URL of the website with SSL support (usually starting with \'https://\')", - "Full URL of the website without SSL support (usually starting with \'http://\')"=>"Full URL of the website without SSL support (usually starting with \'http://\')", + "Full Path to the WKHTMLtoPDF Binary Utility"=>"Full Path to the WKHTMLtoPDF Binary Utility", + "Full Path to the WKHTMLtoPDF Temp Directory"=>"Full Path to the WKHTMLtoPDF Temp Directory", "GD Graphics Library 2.0+"=>"GD Graphics Library 2.0+", + "General"=>"General", "General Site Configuration"=>"General Site Configuration", + "Get Help"=>"Get Help", + "Google account"=>"Google account", + "Group Accounts"=>"Group Accounts", "Group Permissions"=>"Group Permissions", "HTML Editor"=>"HTML Editor", - "HTML Editor Settings"=>"HTML Editor Settings", - "HTML to PDF Path"=>"HTML to PDF Path", - "HTML to show to a user when their session expires and they are trying to perform some action that requires them to have certain permissions."=>"HTML to show to a user when their session expires and they are trying to perform some action that requires them to have certain permissions.", - "HTML to show to a user when they try to perform some action that their user account is not allowed to perform."=>"HTML to show to a user when they try to perform some action that their user account is not allowed to perform.", - "HTML to show to a user when they try to request something that is not found (like a deleted post, section etc.)"=>"HTML to show to a user when they try to request something that is not found (like a deleted post, section etc.)", "Help Link Settings"=>"Help Link Settings", - "Help Settings"=>"Help Settings", - "Here, you can specify what type of encryption your SMTP server connection requires (if any). Please consult your mailserver administrator for this information."=>"Here, you can specify what type of encryption your SMTP server connection requires (if any). Please consult your mailserver administrator for this information.", + "Help Links"=>"Help Links", "Hmmmm...."=>"Hmmmm....", - "How credit is given to authors for their posts."=>"How credit is given to authors for their posts.", - "How long a user can be idle (in seconds) before they are automatically logged out."=>"How long a user can be idle (in seconds) before they are automatically logged out.", - "How long should archived data be retained, in days?"=>"How long should archived data be retained, in days?", - "How many days until the tracking cookie expires?"=>"How many days until the tracking cookie expires?", - "How often, in hours, should the raw tracking data be processed?"=>"How often, in hours, should the raw tracking data be processed?", - "Html to PDF Tmp Directory"=>"Html to PDF Tmp Directory", - "HtmlToPdf Paths"=>"HtmlToPdf Paths", - "I Want to Approve All Comments"=>"I Want to Approve All Comments", - "I Want to Approve All Notes"=>"I Want to Approve All Notes", "I want to begin transferring an existing Exponent v0.9x site"=>"I want to begin transferring an existing Exponent v0.9x site", "I want to start configuring my new site"=>"I want to start configuring my new site", - "If a user is logged-in, do not display anti-spam control."=>"If a user is logged-in, do not display anti-spam control.", "If in doubt, contact your system administrator or hosting provider."=>"If in doubt, contact your system administrator or hosting provider.", "If something fails, please "=>"If something fails, please ", - "If the Exponent implementation of raw SMTP does not work for you, either because of server issues or hosting configurations, check this option to use the standard mail() function provided by PHP. NOTE: If you do so, you will not have to modify any other SMTP settings, as they will be ignored."=>"If the Exponent implementation of raw SMTP does not work for you, either because of server issues or hosting configurations, check this option to use the standard mail() function provided by PHP. NOTE: If you do so, you will not have to modify any other SMTP settings, as they will be ignored.", - "If this option is selected, comments will not be published to your site until you approve them."=>"If this option is selected, comments will not be published to your site until you approve them.", - "If this option is selected, notes will not be displayed until you approve them."=>"If this option is selected, notes will not be displayed until you approve them.", "If you are using a database server that supports TCP or other network connection protocols, and that database software runs on a different physical machine than the web server,"=>"If you are using a database server that supports TCP or other network connection protocols, and that database software runs on a different physical machine than the web server,", - "If you are using reCAPTCHA please enter the private key here."=>"If you are using reCAPTCHA please enter the private key here.", - "If you are using reCAPTCHA please enter the public key here."=>"If you are using reCAPTCHA please enter the public key here.", "If you entered \'localhost\' in the Address field, you should leave this as the default setting."=>"If you entered \'localhost\' in the Address field, you should leave this as the default setting.", - "If you have indicated you would like to be notified of new comments on your site, please enter the email address of all the people you would like to get the notificaiton email addresses."=>"If you have indicated you would like to be notified of new comments on your site, please enter the email address of all the people you would like to get the notificaiton email addresses.", - "If you have indicated you would like to be notified of new notes, please enter the email address of all the people you would like to get the notificaiton email addresses."=>"If you have indicated you would like to be notified of new notes, please enter the email address of all the people you would like to get the notificaiton email addresses.", "If your database server software runs on a different physical machine than the web server, enter the address of the database server machine."=>"If your database server software runs on a different physical machine than the web server, enter the address of the database server machine.", "If your database server software runs on the same machine as the web server, use the default setting, \'localhost\'."=>"If your database server software runs on the same machine as the web server, use the default setting, \'localhost\'.", + "Import Data"=>"Import Data", + "Information"=>"Information", "Install Database"=>"Install Database", + "Install Sample Content"=>"Install Sample Content", "Install Tables"=>"Install Tables", "Installing Tables"=>"Installing Tables", "Installing Tables adds any new fields to existing tables, and adds any additional tables Exponent needs to be awesome."=>"Installing Tables adds any new fields to existing tables, and adds any additional tables Exponent needs to be awesome.", "Installing and Upgrading tables"=>"Installing and Upgrading tables", "It appears you\'ve upgraded your Exponent code."=>"It appears you\'ve upgraded your Exponent code.", - "It can be advantageous to know what your users are looking for. Take note that there is no user interface to see this data yet, you will need to query the database directly to see what your users are searching for."=>"It can be advantageous to know what your users are looking for. Take note that there is no user interface to see this data yet, you will need to query the database directly to see what your users are searching for.", "Just take me to my home page"=>"Just take me to my home page", "Keywords"=>"Keywords", - "LDAP Authentication Options"=>"LDAP Authentication Options", - "LDAP Bind User"=>"LDAP Bind User", - "LDAP Password"=>"LDAP Password", - "LDAP Server"=>"LDAP Server", "Language"=>"Language", "Last Name"=>"Last Name", - "Learn More about configuring your website"=>"Learn More about configuring your website", - "Links"=>"Links", + "Loading Site Configuration"=>"Loading Site Configuration", "Log In"=>"Log In", "Log In Screen"=>"Log In Screen", "Log In and start managing your site"=>"Log In and start managing your site", + "Log Out"=>"Log Out", "Log back in to start using all your fancy new enhancements!"=>"Log back in to start using all your fancy new enhancements!", - "Mail Settings"=>"Mail Settings", + "Mail Server"=>"Mail Server", + "Mail Server Settings"=>"Mail Server Settings", + "Maintenance"=>"Maintenance", "Maintenance Mode Message"=>"Maintenance Mode Message", - "Maintenance Mode?"=>"Maintenance Mode?", - "Maintenance Settings"=>"Maintenance Settings", "Make sure that this user has the proper database user privileges."=>"Make sure that this user has the proper database user privileges.", - "Manage Active Modules"=>"Manage Active Modules", + "Manage Group Permissions"=>"Manage Group Permissions", "Manage Modules"=>"Manage Modules", + "Manage Tags"=>"Manage Tags", + "Manage Themes"=>"Manage Themes", + "Manage User Permissions"=>"Manage User Permissions", + "Manage all pages"=>"Manage all pages", + "Managing CKEditor Toolbars"=>"Managing CKEditor Toolbars", + "Managing Users"=>"Managing Users", "Maximum # of files that can be specified in the \'f\' GET parameter"=>"Maximum # of files that can be specified in the \'f\' GET parameter", "Maximum age of browser cache in seconds"=>"Maximum age of browser cache in seconds", "Meta"=>"Meta", + "Migrate Content"=>"Migrate Content", + "Migrate Files"=>"Migrate Files", + "Migrate Pages"=>"Migrate Pages", + "Migrate Users/Groups"=>"Migrate Users/Groups", + "Migration"=>"Migration", + "Minify"=>"Minify", "Minify Configuration"=>"Minify Configuration", - "Minify Error Logger"=>"Minify Error Logger", - "Minify Max Age"=>"Minify Max Age", - "Minify Max Files"=>"Minify Max Files", - "Minify URL Length"=>"Minify URL Length", "More Information"=>"More Information", + "Move Module Down"=>"Move Module Down", + "Move Module Up"=>"Move Module Up", + "Name"=>"Name", "New Installation"=>"New Installation", "Next, we\'ll "=>"Next, we\'ll ", - "No Authentication"=>"No Authentication", "No Tables Were Changed!"=>"No Tables Were Changed!", "Non-SSL URL Base"=>"Non-SSL URL Base", "Normal"=>"Normal", - "Not Found Page Title"=>"Not Found Page Title", "Note:"=>"Note:", - "Notification Email Address"=>"Notification Email Address", - "Notification Email Address(es) (Enter multiple addresses by using a comma to separate them)"=>"Notification Email Address(es) (Enter multiple addresses by using a comma to separate them)", - "Notification Subject"=>"Notification Subject", - "Notification of New User"=>"Notification of New User", - "Notify Me of New Comments"=>"Notify Me of New Comments", - "Notify Me of New Notes"=>"Notify Me of New Notes", + "Notify a site administrator by email when a new user registers on your website?"=>"Notify a site administrator by email when a new user registers on your website?", + "Notify a site administrator of New Comments?"=>"Notify a site administrator of New Comments?", "Okay"=>"Okay", "Open BaseDir Not Enabled"=>"Open BaseDir Not Enabled", + "Optimize Database"=>"Optimize Database", "Other Tests"=>"Other Tests", + "PDF Generation"=>"PDF Generation", "PHP 5.2.1+"=>"PHP 5.2.1+", - "Page title for your 404 Not Found Page"=>"Page title for your 404 Not Found Page", + "PHP Version"=>"PHP Version", + "Page Title For \'Not Found\' (404) Error"=>"Page Title For \'Not Found\' (404) Error", + "Pages"=>"Pages", "Passed"=>"Passed", "Password"=>"Password", "Password Again"=>"Password Again", - "Password of the user above."=>"Password of the user above.", "Permission Management"=>"Permission Management", "Pick Your Theme"=>"Pick Your Theme", "Please enter some basic information for your site."=>"Please enter some basic information for your site.", "Please select a language"=>"Please select a language", "Port"=>"Port", "Preview"=>"Preview", + "Preview Mode"=>"Preview Mode", + "Profile Definitions"=>"Profile Definitions", + "Regenerate Search Index"=>"Regenerate Search Index", + "Release date"=>"Release date", + "Release level"=>"Release level", "Remove Module"=>"Remove Module", - "Replace Missing Database Table Entries"=>"Replace Missing Database Table Entries", - "Require Login to Add Notes"=>"Require Login to Add Notes", - "Require Login to Post Comments"=>"Require Login to Post Comments", + "Remove Unused Tables"=>"Remove Unused Tables", + "Repair Database"=>"Repair Database", + "Repair/Replace Missing Database Table Entries"=>"Repair/Replace Missing Database Table Entries", + "Report a bug"=>"Report a bug", + "Require User Login to Post Comments?"=>"Require User Login to Post Comments?", + "Reset Sessions Table"=>"Reset Sessions Table", "Results"=>"Results", "Run Upgrades"=>"Run Upgrades", - "SMTP Mail Settings"=>"SMTP Mail Settings", + "SEF Name"=>"SEF Name", "SMTP Password"=>"SMTP Password", + "SMTP Port"=>"SMTP Port", "SMTP Server"=>"SMTP Server", "SMTP Server Settings"=>"SMTP Server Settings", "SMTP Username"=>"SMTP Username", - "SSL"=>"SSL", "SSL URL Base"=>"SSL URL Base", "Safe Mode Not Enabled"=>"Safe Mode Not Enabled", "Sanity checks are being run right now to ensure that the web server directory you wish to install Exponent in, is suitable."=>"Sanity checks are being run right now to ensure that the web server directory you wish to install Exponent in, is suitable.", - "Save Search Queries"=>"Save Search Queries", + "Save Website Configuration"=>"Save Website Configuration", "Saving Configuration"=>"Saving Configuration", "Search"=>"Search", - "Search Engine Friendly URLs"=>"Search Engine Friendly URLs", - "Search engine keywords for the site."=>"Search engine keywords for the site.", + "Search Engine Friendly URLs?"=>"Search Engine Friendly URLs?", + "Security"=>"Security", "Security Settings"=>"Security Settings", - "Select the default timezone for this site. CAUTION: This may break calendars and other features that use date functions if you change this after entering data. Must be in a format shown here: "=>"Select the default timezone for this site. CAUTION: This may break calendars and other features that use date functions if you change this after entering data. Must be in a format shown here: ", - "Select this option if you want to send a welcome email to a new user when they create a new account on your website."=>"Select this option if you want to send a welcome email to a new user when they create a new account on your website.", - "Select this option if you want to send an email to a site administrator/webmaster when a new user registers on your website."=>"Select this option if you want to send an email to a site administrator/webmaster when a new user registers on your website.", "Select which database server software package your web server is running. If the software is not listed, it is not supported by Exponent."=>"Select which database server software package your web server is running. If the software is not listed, it is not supported by Exponent.", - "Selecting this will prompt the user for their email address instead of a username."=>"Selecting this will prompt the user for their email address instead of a username.", - "Send Welcome Email to New Users"=>"Send Welcome Email to New Users", - "Server Address"=>"Server Address", - "Server Port"=>"Server Port", - "Session Timeout"=>"Session Timeout", - "Set to true to log error messages to FirePHP"=>"Set to true to log error messages to FirePHP", - "Sets the encoding of a connection. Supported on mySQL higher 4.1.12."=>"Sets the encoding of a connection. Supported on mySQL higher 4.1.12.", - "Should the slingbar display at the top of the page? Unchecking will place the slingbar at the bottom of the page."=>"Should the slingbar display at the top of the page? Unchecking will place the slingbar at the bottom of the page.", - "Simple Admin notes"=>"Simple Admin notes", + "Send a Welcome email to the user after signing up?"=>"Send a Welcome email to the user after signing up?", + "Session Timeout in seconds"=>"Session Timeout in seconds", + "Should users be allowed to create accounts for themselves?"=>"Should users be allowed to create accounts for themselves?", "Simple Site Upgrade"=>"Simple Site Upgrade", "Simply create a database using your database tool of of choice, and fill in the information on this page."=>"Simply create a database using your database tool of of choice, and fill in the information on this page.", "Since your website has a configuration file already in place, we\'re going to perform a couple simple tasks to ensure you\'re up and running in no time."=>"Since your website has a configuration file already in place, we\'re going to perform a couple simple tasks to ensure you\'re up and running in no time.", "Site Configuration"=>"Site Configuration", "Site Header"=>"Site Header", "Site Maintenance Mode Settings"=>"Site Maintenance Mode Settings", - "Site Maintenance Settings"=>"Site Maintenance Settings", "Site Title"=>"Site Title", "Site/Organization Name"=>"Site/Organization Name", + "Skin"=>"Skin", "Skip using Anti-Spam measures for Logged-In Users?"=>"Skip using Anti-Spam measures for Logged-In Users?", - "Slingbar at Top"=>"Slingbar at Top", + "SpellCheck"=>"SpellCheck", "Start of Week"=>"Start of Week", "Status"=>"Status", "Structure Management"=>"Structure Management", + "Subject of the Welcome email to the user"=>"Subject of the Welcome email to the user", + "Subject of the administrator\'s new user notification"=>"Subject of the administrator\'s new user notification", + "Subtheme"=>"Subtheme", "Succeeded"=>"Succeeded", "Success"=>"Success", "Super Administrator"=>"Super Administrator", "Supported"=>"Supported", "System"=>"System", + "System Cache"=>"System Cache", "System Requirements Check"=>"System Requirements Check", - "TLS"=>"TLS", "Table Name"=>"Table Name", "Table Prefix"=>"Table Prefix", "Take me to your leader"=>"Take me to your leader", "Temporary File Creation"=>"Temporary File Creation", + "Test SMTP Mail Server Settings"=>"Test SMTP Mail Server Settings", "Text Items"=>"Text Items", "The Exponent Development Team would like to thank you for downloading and installing the Exponent Content Management System. "=>"The Exponent Development Team would like to thank you for downloading and installing the Exponent Content Management System. ", "The Exponent Install Wizard found no problems with the server environment."=>"The Exponent Install Wizard found no problems with the server environment.", - "The IP address or host/domain name of the server to connect to for sending email through SMTP."=>"The IP address or host/domain name of the server to connect to for sending email through SMTP.", - "The actual path of the binary html to pdf library"=>"The actual path of the binary html to pdf library", - "The current theme layout"=>"The current theme layout", - "The database server software package."=>"The database server software package.", - "The default section."=>"The default section.", - "The domain name or IP address of the database server. If this is a local server, use \'localhost\'"=>"The domain name or IP address of the database server. If this is a local server, use \'localhost\'", - "The from address to use when talking to the SMTP server. This is important for people using ISP SMTP servers, which may restrict access to certain email addresses."=>"The from address to use when talking to the SMTP server. This is important for people using ISP SMTP servers, which may restrict access to certain email addresses.", - "The header of the website."=>"The header of the website.", - "The language to use."=>"The language to use.", "The length of minification url"=>"The length of minification url", - "The longer that data is retained, the more accurate the statistics are that can be produced and also the more storage space required to store them."=>"The longer that data is retained, the more accurate the statistics are that can be produced and also the more storage space required to store them.", - "The more often this updates, the smaller your database will be and the more up-to-date statistics you can view, however, running this too often wastes server resources."=>"The more often this updates, the smaller your database will be and the more up-to-date statistics you can view, however, running this too often wastes server resources.", - "The name of the database to store the site tables in."=>"The name of the database to store the site tables in.", - "The name of the user to connect to the database server as"=>"The name of the user to connect to the database server as", - "The name of your company or organization. This is used in several places in the system."=>"The name of your company or organization. This is used in several places in the system.", "The password of your administrator account."=>"The password of your administrator account.", - "The password to use when connecting to an SMTP server that requires some form of authentication"=>"The password to use when connecting to an SMTP server that requires some form of authentication", - "The port that the SMTP server is listening to for SMTP connections. If you do not know what this is, leave it as the default of 25."=>"The port that the SMTP server is listening to for SMTP connections. If you do not know what this is, leave it as the default of 25.", - "The port that the database server runs on. For MySQL, this is 3306."=>"The port that the database server runs on. For MySQL, this is 3306.", - "The readability / writability of created directories, for users other than the web server user."=>"The readability / writability of created directories, for users other than the web server user.", - "The readability / writability of uploaded files, for users other than the web server user."=>"The readability / writability of uploaded files, for users other than the web server user.", - "The title of the website."=>"The title of the website.", - "The tmp directory to be used by htmltopdf library"=>"The tmp directory to be used by htmltopdf library", "The user you\'re about to create will be the"=>"The user you\'re about to create will be the", "The username of your administrator account. You should change this to something other than the default of \'admin\'."=>"The username of your administrator account. You should change this to something other than the default of \'admin\'.", - "The username or context for the binding to the LDAP Server to perform administration tasks(This currently doesn\'t do anything.)"=>"The username or context for the binding to the LDAP Server to perform administration tasks(This currently doesn\'t do anything.)", - "The username to use when connecting to an SMTP server that requires some form of authentication"=>"The username to use when connecting to an SMTP server that requires some form of authentication", - "Theme"=>"Theme", "This Exponent Site has already been configured."=>"This Exponent Site has already been configured.", "This Script attempts to "=>"This Script attempts to ", "This content is being sent to the Recycle Bin to be recovered later if you wish."=>"This content is being sent to the Recycle Bin to be recovered later if you wish.", "This installation wizard will guide you step by step through the configuration and setup of your new Exponent-powered website."=>"This installation wizard will guide you step by step through the configuration and setup of your new Exponent-powered website.", - "This is the text to be put in the message body of a welcome email sent to new users."=>"This is the text to be put in the message body of a welcome email sent to new users.", - "This is the text to be put in the subject line of a new user notification email."=>"This is the text to be put in the subject line of a new user notification email.", - "This is the text to be put in the subject line of a welcome email sent to new users."=>"This is the text to be put in the subject line of a welcome email sent to new users.", - "This is where Exponent will look for help docs. If unsure, leave the defaults unchanged."=>"This is where Exponent will look for help docs. If unsure, leave the defaults unchanged.", "This level of administration has un-restricted access and abilities throughout the entire website."=>"This level of administration has un-restricted access and abilities throughout the entire website.", - "This option enables error reporting. This is useful for developement, but should be turned off for a live site."=>"This option enables error reporting. This is useful for developement, but should be turned off for a live site.", - "This will affect how long the users\' browsers will retain the tracking data which will help detect returning users. It should NOT be set to a larger value than the archive retention time."=>"This will affect how long the users\' browsers will retain the tracking data which will help detect returning users. It should NOT be set to a larger value than the archive retention time.", "This will set the default Language for the installation process as well as your new Exponent website."=>"This will set the default Language for the installation process as well as your new Exponent website.", - "This will turn on and off the timeout value for users."=>"This will turn on and off the timeout value for users.", + "Thumbnail JPEG Quality (1 - 95)"=>"Thumbnail JPEG Quality (1 - 95)", "Time Format"=>"Time Format", - "Track Search Queries"=>"Track Search Queries", - "Trying to Connect to Database"=>"Trying to Connect to Database", + "To obtain the reCAPTCHA \'keys\', you\'ll need to first have a"=>"To obtain the reCAPTCHA \'keys\', you\'ll need to first have a", + "Top of Viewport,Bottom of Viewport"=>"Top of Viewport,Bottom of Viewport", + "Turn Error Reporting off"=>"Turn Error Reporting off", + "Turn Maintenance Mode on"=>"Turn Maintenance Mode on", + "Turn Minification on"=>"Turn Minification on", + "Turn Mobile View on"=>"Turn Mobile View on", + "Turn Preview Mode on"=>"Turn Preview Mode on", "Turn SMTP Debugging On?"=>"Turn SMTP Debugging On?", - "Turn on LDAP Authentication"=>"Turn on LDAP Authentication", - "Turns on additional debugging output for all email system use."=>"Turns on additional debugging output for all email system use.", "Type of Encrypted Connection"=>"Type of Encrypted Connection", "Type your password again."=>"Type your password again.", - "URL For Help Documentation"=>"URL For Help Documentation", + "URL for Help Documentation"=>"URL for Help Documentation", "Update Version Information"=>"Update Version Information", "Upgrade"=>"Upgrade", "Upgrade Scripts"=>"Upgrade Scripts", + "Upload Extension"=>"Upload Extension", + "Upload Files"=>"Upload Files", "Use"=>"Use", - "Use CAPTCHA Test?"=>"Use CAPTCHA Test?", - "Use Email Address as username"=>"Use Email Address as username", - "Use PHP mail() Function?"=>"Use PHP mail() Function?", + "Use Anti-Spam measures?"=>"Use Anti-Spam measures?", + "Use an email address instead of a username?"=>"Use an email address instead of a username?", + "Use php\'s mail() function instead of SMTP?"=>"Use php\'s mail() function instead of SMTP?", + "User Accounts"=>"User Accounts", "User Comment Policies"=>"User Comment Policies", + "User Management"=>"User Management", "User Permissions"=>"User Permissions", "User Registration"=>"User Registration", - "User Tracking"=>"User Tracking", + "User Sessions"=>"User Sessions", "Username"=>"Username", + "Username:"=>"Username:", + "View Expired/Unpublished News"=>"View Expired/Unpublished News", + "WYSIWYG Editor"=>"WYSIWYG Editor", + "WYSIWYG Editor Settings"=>"WYSIWYG Editor Settings", + "WYSIWYG editor settings"=>"WYSIWYG editor settings", "We fervently hope that you will enjoy the power, flexibility, and ease-of-use that Exponent has to offer."=>"We fervently hope that you will enjoy the power, flexibility, and ease-of-use that Exponent has to offer.", "We weren\'t able to remove /install/not_configured. Remove this file manually to complete your installation."=>"We weren\'t able to remove /install/not_configured. Remove this file manually to complete your installation.", "We\'ll now run any upgrade scripts needed for this version of Exponent."=>"We\'ll now run any upgrade scripts needed for this version of Exponent.", - "Welcome Message"=>"Welcome Message", - "Welcome Subject"=>"Welcome Subject", "Welcome to Exponent CMS"=>"Welcome to Exponent CMS", - "Whether or not new users should be allowed to create accounts for themselves."=>"Whether or not new users should be allowed to create accounts for themselves.", - "Whether or not the site is in maintenance mode. While in maintenance mode, only administrators and acting administrators will be allowed to login."=>"Whether or not the site is in maintenance mode. While in maintenance mode, only administrators and acting administrators will be allowed to login.", - "Whether or not to turn on Secure Linking through SSL"=>"Whether or not to turn on Secure Linking through SSL", + "Word Pasting"=>"Word Pasting", "XML (Expat) Library Support"=>"XML (Expat) Library Support", "You must specify a username."=>"You must specify a username.", "You\'re all set!"=>"You\'re all set!", + "Your email address is invalid. Please check your entry."=>"Your email address is invalid. Please check your entry.", "Your installation is complete!"=>"Your installation is complete!", "Your passwords do not match. Please check your entries."=>"Your passwords do not match. Please check your entries.", "Your theme is your site\'s look and feel. Select what you\'d like you site to look like from the list of themes."=>"Your theme is your site\'s look and feel. Select what you\'d like you site to look like from the list of themes.", "Your upgrade is complete!"=>"Your upgrade is complete!", "Your user session has expired. Please log in again."=>"Your user session has expired. Please log in again.", "ZLib Support"=>"ZLib Support", - "\'Access Denied\' Error Text"=>"\'Access Denied\' Error Text", - "\'Not Found\' Error Text"=>"\'Not Found\' Error Text", - "\'Session Expired\' Error Text"=>"\'Session Expired\' Error Text", + "\'Access Denied\' (403) Error Message"=>"\'Access Denied\' (403) Error Message", + "\'Not Found\' (404) Error Message"=>"\'Not Found\' (404) Error Message", + "\'Session Expired\' Error Message"=>"\'Session Expired\' Error Message", "admin"=>"admin", "and then run through any upgrade scripts needed to bring your code and database up to date."=>"and then run through any upgrade scripts needed to bring your code and database up to date.", + "anti-spam measures"=>"anti-spam measures", "be obscured, because it cannot be obscured in the configuration file. The Exponent developers urge you to use a completely new password, unlike any of your others, for security reasons."=>"be obscured, because it cannot be obscured in the configuration file. The Exponent developers urge you to use a completely new password, unlike any of your others, for security reasons.", + "configuring your website"=>"configuring your website", + "display settings"=>"display settings", "enter the connection port."=>"enter the connection port.", + "error messages"=>"error messages", "files could not be removed."=>"files could not be removed.", "for an explanation of what exactly the installer is checking for, and how to fix it."=>"for an explanation of what exactly the installer is checking for, and how to fix it.", "for the entire system. "=>"for the entire system. ", + "general site configuration"=>"general site configuration", + "generating PDF\'s"=>"generating PDF\'s", + "help link settings"=>"help link settings", + "mail server settings"=>"mail server settings", + "minification"=>"minification", "not"=>"not", - "reCAPTCHA Private Key."=>"reCAPTCHA Private Key.", - "reCAPTCHA Public Key."=>"reCAPTCHA Public Key.", - "reCAPTCHA Theme."=>"reCAPTCHA Theme.", + "re-Captcha Theme"=>"re-Captcha Theme", + "reCAPTCHA Private Key"=>"reCAPTCHA Private Key", + "reCAPTCHA Public Key"=>"reCAPTCHA Public Key", "read about each sanity check"=>"read about each sanity check", + "security settings"=>"security settings", + "site maintenance mode settings"=>"site maintenance mode settings", + "to log in, then setup up a reCAPTCHA account for your domain(s)"=>"to log in, then setup up a reCAPTCHA account for your domain(s)", + "user comment policies"=>"user comment policies", + "user registration"=>"user registration", ); ?> diff --git a/framework/modules-1/common/views/_grouppermissions.tpl b/framework/modules-1/common/views/_grouppermissions.tpl index e318eb5585..a702c874b1 100644 --- a/framework/modules-1/common/views/_grouppermissions.tpl +++ b/framework/modules-1/common/views/_grouppermissions.tpl @@ -18,7 +18,7 @@
- {help text="Get Help Managing Group Permissions" module="manage-group-permissions"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Group Permissions"|gettext) module="manage-group-permissions"}

{'Assign Group Permissions'|gettext}

diff --git a/framework/modules-1/common/views/_userpermissions.tpl b/framework/modules-1/common/views/_userpermissions.tpl index 30fcee82fa..9dd172b388 100644 --- a/framework/modules-1/common/views/_userpermissions.tpl +++ b/framework/modules-1/common/views/_userpermissions.tpl @@ -18,7 +18,7 @@
- {help text="Get Help Managing User Permissions" module="manage-user-permissions"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing User Permissions"|gettext) module="manage-user-permissions"}

{'Assign User Permissions'|gettext}

diff --git a/framework/modules-1/containermodule/views/_form_edit.tpl b/framework/modules-1/containermodule/views/_form_edit.tpl index c76af8df81..e6840c5921 100644 --- a/framework/modules-1/containermodule/views/_form_edit.tpl +++ b/framework/modules-1/containermodule/views/_form_edit.tpl @@ -25,7 +25,7 @@ {if $user->is_admin} {"Manage Active Modules"|gettext} {/if} - {help text="Get Help with Adding Content" module="how-to-add-modules-to-a-page"} + {help text="Get Help"|gettext|cat:" "|cat:("Adding Page Content"|gettext) module="how-to-add-modules-to-a-page"}

{if $is_edit}Edit Module{else}Add New Content{/if}

diff --git a/framework/modules-1/navigationmodule/views/_form_editContentPage.tpl b/framework/modules-1/navigationmodule/views/_form_editContentPage.tpl index 5281ec79a0..2ab399296a 100644 --- a/framework/modules-1/navigationmodule/views/_form_editContentPage.tpl +++ b/framework/modules-1/navigationmodule/views/_form_editContentPage.tpl @@ -20,7 +20,7 @@
- {help text="Get Help Editing Content Pages" module="edit-content-page"} + {help text="Get Help"|gettext|cat:" "|cat:("Editing Content Pages"|gettext) module="edit-content-page"}

{if $is_edit == 1}{'Edit Existing Content Page'|gettext}{else}{'Create New Content Page'|gettext}{/if}

diff --git a/framework/modules-1/navigationmodule/views/_form_editExternalAlias.tpl b/framework/modules-1/navigationmodule/views/_form_editExternalAlias.tpl index 1c6e78e3d8..408490cdeb 100644 --- a/framework/modules-1/navigationmodule/views/_form_editExternalAlias.tpl +++ b/framework/modules-1/navigationmodule/views/_form_editExternalAlias.tpl @@ -17,7 +17,7 @@
- {help text="Get Help Editing External Alias Pages" module="edit-external-page"} + {help text="Get Help"|gettext|cat:" "|cat:("Editing External Alias Pages"|gettext) module="edit-external-page"}

{if $is_edit == 1}{'Edit Existing External Alias'|gettext}{else}{'New External Alias'|gettext}{/if}

diff --git a/framework/modules-1/navigationmodule/views/_form_editInternalAlias.tpl b/framework/modules-1/navigationmodule/views/_form_editInternalAlias.tpl index e235cb91d7..6d9fa1c4fa 100644 --- a/framework/modules-1/navigationmodule/views/_form_editInternalAlias.tpl +++ b/framework/modules-1/navigationmodule/views/_form_editInternalAlias.tpl @@ -17,7 +17,7 @@
- {help text="Get Help Editing Internal Alias Pages" module="edit-internal-page"} + {help text="Get Help"|gettext|cat:" "|cat:("Editing Internal Alias Pages"|gettext) module="edit-internal-page"}

{if $is_edit == 1}{'Edit Existing Internal Alias'|gettext}{else}{'New Internal Alias'|gettext}{/if}

diff --git a/framework/modules-1/navigationmodule/views/_manager.tpl b/framework/modules-1/navigationmodule/views/_manager.tpl index 904e355728..3bb58e653d 100644 --- a/framework/modules-1/navigationmodule/views/_manager.tpl +++ b/framework/modules-1/navigationmodule/views/_manager.tpl @@ -18,7 +18,7 @@
- {help text="Get Help Managing Pages" module="manage-all-pages"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Pages"|gettext) module="manage-all-pages"}

{'Manage Pages'|gettext}

diff --git a/framework/modules-1/navigationmodule/views/_move_standalone.tpl b/framework/modules-1/navigationmodule/views/_move_standalone.tpl index 6d28bbfa04..b7a8304b82 100644 --- a/framework/modules-1/navigationmodule/views/_move_standalone.tpl +++ b/framework/modules-1/navigationmodule/views/_move_standalone.tpl @@ -17,7 +17,7 @@
- {help text="Get Help Moving Standalone Pages" module="move-standalone-page"} + {help text="Get Help"|gettext|cat:" "|cat:("Moving Standalone Pages"|gettext) module="move-standalone-page"}

{'Move Standalone Page'|gettext}

diff --git a/framework/modules/administration/views/administration/configure_site.tpl b/framework/modules/administration/views/administration/configure_site.tpl index f24d7998ef..0deaef4fe1 100755 --- a/framework/modules/administration/views/administration/configure_site.tpl +++ b/framework/modules/administration/views/administration/configure_site.tpl @@ -19,7 +19,7 @@
- {help text="Learn More about configuring your website"|gettext page="site-configuration"} + {help text="Get Help"|gettext|cat:" "|cat:("configuring your website"|gettext) page="site-configuration"}

{'Configure Website'|gettext}

@@ -47,7 +47,7 @@
- {help text="Learn More about general site configuration"|gettext module="general-configuration"} + {help text="Get Help"|gettext|cat:" "|cat:("general site configuration"|gettext) module="general-configuration"}

{"General Site Configuration"|gettext}

@@ -57,13 +57,13 @@ {control type="checkbox" postfalse=1 name="sc[SEF_URLS]" label="Search Engine Friendly URLs?"|gettext checked=$smarty.const.SEF_URLS value=1} {control type="checkbox" postfalse=1 name="sc[ADVERTISE_RSS]" label="Advertise all RSS Feeds to Web Browsers?"|gettext checked=$smarty.const.ADVERTISE_RSS value=1} {control type="dropdown" name="sc[SITE_DEFAULT_SECTION]" label="Default Section (Home Page)"|gettext items=$section_dropdown default=$smarty.const.SITE_DEFAULT_SECTION} - {control type="textarea" name="sc[SITE_KEYWORDS]" label='('|cat:'Meta'|gettext|cat:') '|cat:'Keywords'|gettext value=$smarty.const.SITE_KEYWORDS} - {control type="textarea" name="sc[SITE_DESCRIPTION]" label='('|cat:'Meta'|gettext|cat:') '|cat:'Description'|gettext value=$smarty.const.SITE_DESCRIPTION} + {control type="textarea" name="sc[SITE_KEYWORDS]" label='('|cat:('Meta'|gettext)|cat:') '|cat:('Keywords'|gettext) value=$smarty.const.SITE_KEYWORDS} + {control type="textarea" name="sc[SITE_DESCRIPTION]" label='('|cat:('Meta'|gettext)|cat:') '|cat:('Description'|gettext) value=$smarty.const.SITE_DESCRIPTION}
- {help text="Learn More about anti-spam measures"|gettext module="anti-spam-measures"} + {help text="Get Help"|gettext|cat:" "|cat:("anti-spam measures"|gettext) module="anti-spam-measures"}

{gettext str="Anti-Spam Measures"}

@@ -78,7 +78,7 @@
- {help text="Learn More about user registration"|gettext module="user-registration"} + {help text="Get Help"|gettext|cat:" "|cat:("user registration"|gettext) module="user-registration"}

{gettext str="User Registration"}

@@ -94,7 +94,7 @@
- {help text="Learn More about user comment policies"|gettext module="user-comment-policies"} + {help text="Get Help"|gettext|cat:" "|cat:("user comment policies"|gettext) module="user-comment-policies"}

{gettext str="User Comment Policies"}

@@ -106,7 +106,7 @@
- {help text="Learn More about display settings"|gettext module="display-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("display settings"|gettext) module="display-settings"}

{gettext str="Display Settings"}

@@ -127,7 +127,7 @@
- {help text="Learn More about mail server settings"|gettext module="mail-server-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("mail server settings"|gettext) module="mail-server-settings"}

{gettext str="Mail Server Settings"}

@@ -144,7 +144,7 @@
- {help text="Learn More about site maintenance mode settings"|gettext module="site-maintenance-mode-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("site maintenance mode settings"|gettext) module="site-maintenance-mode-settings"}

{gettext str="Site Maintenance Mode Settings"}

@@ -154,7 +154,7 @@
- {help text="Learn More about security settings"|gettext module="security-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("security settings"|gettext) module="security-settings"}

{gettext str="Security Settings"}

@@ -169,7 +169,7 @@
- {help text="Learn More about help link settings"|gettext module="help-link-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("help link settings"|gettext) module="help-link-settings"}

{gettext str="Help Link Settings"}

@@ -179,7 +179,7 @@
- {help text="Learn More about WYSIWYG editor settings"|gettext module="wysiwyg-editor-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("WYSIWYG editor settings"|gettext) module="wysiwyg-editor-settings"}

{gettext str="WYSIWYG Editor Settings"}

@@ -192,7 +192,7 @@
- {help text="Learn More about error messages"|gettext module="error-messages"} + {help text="Get Help"|gettext|cat:" "|cat:("error messages"|gettext) module="error-messages"}

{"Error Messages"|gettext}

@@ -204,7 +204,7 @@
- {help text="Learn More about generating PDF's"|gettext module="pdf-generation"} + {help text="Get Help"|gettext|cat:" "|cat:("generating PDF's"|gettext) module="pdf-generation"}

{"PDF Generation"|gettext}

@@ -214,7 +214,7 @@
- {help text="Learn More about minification"|gettext module="minify-configuration"} + {help text="Get Help"|gettext|cat:" "|cat:("minification"|gettext) module="minify-configuration"}

{"Minify Configuration"|gettext}

diff --git a/framework/modules/administration/views/administration/manage_themes.tpl b/framework/modules/administration/views/administration/manage_themes.tpl index 60e2438805..32d9eafdbc 100755 --- a/framework/modules/administration/views/administration/manage_themes.tpl +++ b/framework/modules/administration/views/administration/manage_themes.tpl @@ -23,7 +23,7 @@
- {help text="Get Help Managing Themes" module="manage-themes"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Themes"|gettext) module="manage-themes"}

{"Theme Manager"|gettext}

diff --git a/framework/modules/administration/views/administration/upload_extension.tpl b/framework/modules/administration/views/administration/upload_extension.tpl index 41f07584f6..bea852fe1e 100644 --- a/framework/modules/administration/views/administration/upload_extension.tpl +++ b/framework/modules/administration/views/administration/upload_extension.tpl @@ -16,7 +16,7 @@
- {help text="Get Help Uploading New Extensions" module="upload-extension"} + {help text="Get Help"|gettext|cat:" "|cat:("Uploading New Extensions"|gettext) module="upload-extension"}

Upload new Extension

diff --git a/framework/modules/core/views/expHTMLEditor/edit.tpl b/framework/modules/core/views/expHTMLEditor/edit.tpl index adf1df535c..59068c891b 100755 --- a/framework/modules/core/views/expHTMLEditor/edit.tpl +++ b/framework/modules/core/views/expHTMLEditor/edit.tpl @@ -17,7 +17,7 @@
- {help text="Get Help with Toolbar Configuration" module="ckeditor-toolbar-configuration"} + {help text="Get Help"|gettext|cat:" "|cat:("Configuring Toolbars"|gettext) module="ckeditor-toolbar-configuration"}
{if $record->id != ""}

Editing CKEditor Toolbar Configuration

diff --git a/framework/modules/core/views/expHTMLEditor/manage.tpl b/framework/modules/core/views/expHTMLEditor/manage.tpl index 42ee8d9ed2..c03916d56c 100755 --- a/framework/modules/core/views/expHTMLEditor/manage.tpl +++ b/framework/modules/core/views/expHTMLEditor/manage.tpl @@ -26,7 +26,7 @@
{"Create New Configuration"|gettext} - {help text="Get Help Managing CKEditor Toolbars"|gettext module="ckeditor-toolbar-configuration"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing CKEditor Toolbars"|gettext) module="ckeditor-toolbar-configuration"}

{"CKEditor Toolbar Manager"|gettext}

diff --git a/framework/modules/core/views/expModule/manage.tpl b/framework/modules/core/views/expModule/manage.tpl index cb7ded0c69..b3e5257147 100755 --- a/framework/modules/core/views/expModule/manage.tpl +++ b/framework/modules/core/views/expModule/manage.tpl @@ -58,7 +58,7 @@
- {help text="Get Help Managing Modules"|gettext module="manage-modules"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Modules"|gettext) module="manage-modules"}

{"Module Manager"|gettext}

diff --git a/framework/modules/file/views/file/picker_cke.tpl b/framework/modules/file/views/file/picker_cke.tpl index 6a77a286d9..0d6e93283e 100755 --- a/framework/modules/file/views/file/picker_cke.tpl +++ b/framework/modules/file/views/file/picker_cke.tpl @@ -20,7 +20,7 @@ {messagequeue}
- {help text="Get Help with the File Manager" module="file-manager"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Files"|gettext) module="file-manager"}
diff --git a/framework/modules/file/views/file/uploader.tpl b/framework/modules/file/views/file/uploader.tpl index 4181b503ef..2973525cb8 100755 --- a/framework/modules/file/views/file/uploader.tpl +++ b/framework/modules/file/views/file/uploader.tpl @@ -29,7 +29,7 @@
- {help text="Get Help with Uploading Files" module="upload-files"} + {help text="Get Help"|gettext|cat:" "|cat:("Uploading Files"|gettext) module="upload-files"}
diff --git a/framework/modules/migration/views/migration/configure.tpl b/framework/modules/migration/views/migration/configure.tpl index 2945ead7e4..d9ef5f7111 100755 --- a/framework/modules/migration/views/migration/configure.tpl +++ b/framework/modules/migration/views/migration/configure.tpl @@ -17,7 +17,7 @@
- {help text="Get Help with Migration Database Settings" module="configure-migration-settings"} + {help text="Get Help"|gettext|cat:" "|cat:("Migration Database Settings"|gettext) module="configure-migration-settings"}

{"Database Settings to Migrate Your Old Site"|gettext}

diff --git a/framework/modules/migration/views/migration/manage_content.tpl b/framework/modules/migration/views/migration/manage_content.tpl index bf5871ca5c..61ac0329f8 100755 --- a/framework/modules/migration/views/migration/manage_content.tpl +++ b/framework/modules/migration/views/migration/manage_content.tpl @@ -21,7 +21,7 @@
- {help text="Get Help with Migrating Content" module="migrate-content"} + {help text="Get Help"|gettext|cat:" "|cat:("Migrating Content"|gettext) module="migrate-content"}

{"Migrate Content"|gettext}

diff --git a/framework/modules/migration/views/migration/manage_files.tpl b/framework/modules/migration/views/migration/manage_files.tpl index 2cdbaa5479..de05b9387a 100755 --- a/framework/modules/migration/views/migration/manage_files.tpl +++ b/framework/modules/migration/views/migration/manage_files.tpl @@ -17,7 +17,7 @@
- {help text="Get Help with Migrating Files" module="migrate-files"} + {help text="Get Help"|gettext|cat:" "|cat:("Migrating Files"|gettext) module="migrate-files"}

{"Migrate Files"|gettext}

diff --git a/framework/modules/migration/views/migration/manage_pages.tpl b/framework/modules/migration/views/migration/manage_pages.tpl index bd61fef539..82730ff45b 100755 --- a/framework/modules/migration/views/migration/manage_pages.tpl +++ b/framework/modules/migration/views/migration/manage_pages.tpl @@ -21,7 +21,7 @@
- {help text="Get Help with Migrating Pages" module="migrate-pages"} + {help text="Get Help"|gettext|cat:" "|cat:("Migrating Pages"|gettext) module="migrate-pages"}

{"Migrate Pages"|gettext}

diff --git a/framework/modules/migration/views/migration/manage_users.tpl b/framework/modules/migration/views/migration/manage_users.tpl index 2aa39ee376..4efa14fce2 100755 --- a/framework/modules/migration/views/migration/manage_users.tpl +++ b/framework/modules/migration/views/migration/manage_users.tpl @@ -21,7 +21,7 @@
- {help text="Get Help with Migrating Users and Groups" module="migrate-users"} + {help text="Get Help"|gettext|cat:" "|cat:("Migrating Users and Groups"|gettext) module="migrate-users"}

{"Migrate Users and Groups"|gettext}

diff --git a/framework/modules/pixidou/includes/class.upload/class.upload.php b/framework/modules/pixidou/includes/class.upload/class.upload.php index d1e0f357ba..56779e04ed 100755 --- a/framework/modules/pixidou/includes/class.upload/class.upload.php +++ b/framework/modules/pixidou/includes/class.upload/class.upload.php @@ -3192,8 +3192,8 @@ function imagetransfer($src_im, $dst_im) { * If the output format is PNG, then we do it pixel per pixel to retain the alpha channel * * @access private - * @param resource $dst_img Destination image - * @param resource $src_img Overlay image + * @param $dst_im + * @param $src_im * @param int $dst_x x-coordinate of destination point * @param int $dst_y y-coordinate of destination point * @param int $src_x x-coordinate of source point @@ -3201,6 +3201,8 @@ function imagetransfer($src_im, $dst_im) { * @param int $src_w Source width * @param int $src_h Source height * @param int $pct Optional percentage of the overlay, between 0 and 100 (default: 100) + * @internal param \resource $dst_img Destination image + * @internal param \resource $src_img Overlay image * @return resource Destination image */ function imagecopymergealpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct = 0) { @@ -5011,6 +5013,8 @@ function clean() { * This function has been written by DHKold, and is used with permission of the author * * @access public + * @param $filename + * @return bool|\resource */ function imagecreatefrombmp($filename) { if (! $f1 = fopen($filename,"rb")) return false; @@ -5086,6 +5090,9 @@ function imagecreatefrombmp($filename) { * This function has been published on the PHP website, and can be used freely * * @access public + * @param $im + * @param string $filename + * @return bool */ function imagebmp(&$im, $filename = "") { diff --git a/framework/modules/users/views/users/change_password.tpl b/framework/modules/users/views/users/change_password.tpl index 7e8550ca80..9148892fea 100755 --- a/framework/modules/users/views/users/change_password.tpl +++ b/framework/modules/users/views/users/change_password.tpl @@ -17,7 +17,7 @@
- {help text="Get Help with Changing User Passwords" module="change-my-password"} + {help text="Get Help"|gettext|cat:" "|cat:("Changing User Passwords"|gettext) module="change-my-password"}

Change {if $isuser}your{else}{$u->username}'s{/if} password

diff --git a/framework/modules/users/views/users/edituser.tpl b/framework/modules/users/views/users/edituser.tpl index 8bd8e70333..f00ba67cff 100755 --- a/framework/modules/users/views/users/edituser.tpl +++ b/framework/modules/users/views/users/edituser.tpl @@ -18,7 +18,7 @@ {form action=update}
- {help text="Get Help with User Accounts" module="edit-user"} + {help text="Get Help"|gettext|cat:" "|cat:("Editing User Accounts"|gettext) module="edit-user"}
{if $edit_user->id == ""}

Create a New User Account

diff --git a/framework/modules/users/views/users/manage.tpl b/framework/modules/users/views/users/manage.tpl index 5f7d502aa0..ac4fa0ffed 100755 --- a/framework/modules/users/views/users/manage.tpl +++ b/framework/modules/users/views/users/manage.tpl @@ -21,7 +21,7 @@
- {help text="Get Help Managing Users" module="manage-users"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Users"|gettext) module="manage-users"}

{$moduletitle|default:"Manage Users"}

diff --git a/framework/modules/users/views/users/manage_extensions.tpl b/framework/modules/users/views/users/manage_extensions.tpl index a5f5d7e02c..62dba2b50f 100755 --- a/framework/modules/users/views/users/manage_extensions.tpl +++ b/framework/modules/users/views/users/manage_extensions.tpl @@ -21,7 +21,7 @@
- {help text="Get Help Managing User Profile Extensions" module="manage-extensions"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing User Profile Extensions"|gettext) module="manage-extensions"}

{"Manage User Profile Extensions"|gettext}

diff --git a/framework/modules/users/views/users/manage_group_memberships.tpl b/framework/modules/users/views/users/manage_group_memberships.tpl index ad6aee645c..92a25145db 100755 --- a/framework/modules/users/views/users/manage_group_memberships.tpl +++ b/framework/modules/users/views/users/manage_group_memberships.tpl @@ -20,7 +20,7 @@
- {help text="Get Help with Managing Group Memberships" module="manage-group-members"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing Group Memberships"|gettext) module="manage-group-members"}

{"Manage Group Memberships"|gettext}

diff --git a/framework/modules/users/views/users/manage_groups.tpl b/framework/modules/users/views/users/manage_groups.tpl index 9e680e114d..ad9abd02d5 100755 --- a/framework/modules/users/views/users/manage_groups.tpl +++ b/framework/modules/users/views/users/manage_groups.tpl @@ -21,7 +21,7 @@
- {help text="Get Help Managing User Groups" module="manage-groups"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing User Groups"|gettext) module="manage-groups"}

{$moduletitle|default:"Manage User Groups"}

diff --git a/framework/modules/users/views/users/manage_sessions.tpl b/framework/modules/users/views/users/manage_sessions.tpl index ac48281a24..28afb185e5 100755 --- a/framework/modules/users/views/users/manage_sessions.tpl +++ b/framework/modules/users/views/users/manage_sessions.tpl @@ -21,7 +21,7 @@
- {help text="Get Help Managing User Sessions" module="manage-sessions"} + {help text="Get Help"|gettext|cat:" "|cat:("Managing User Sessions"|gettext) module="manage-sessions"}

{"Manage User Sessions"|gettext}

diff --git a/framework/plugins/function.help.php b/framework/plugins/function.help.php index c62ebc8de0..89a4153e87 100644 --- a/framework/plugins/function.help.php +++ b/framework/plugins/function.help.php @@ -29,7 +29,7 @@ function smarty_function_help($params,&$smarty) { // figure out the params $text = empty($params['text']) ? ' ' : $params['text']; - $title = empty($params['title']) ? 'Get help for '.$params['module'] : $params['title']; + $title = empty($params['title']) ? gt('Get Help').' for '.$params['module'] : $params['title']; $class = 'helplink'; $class .= empty($params['class']) ? '' : $params['class']; diff --git a/install/index.php b/install/index.php index 2a26f35a40..b5f1522d85 100644 --- a/install/index.php +++ b/install/index.php @@ -20,7 +20,7 @@ ob_start(); -define('DEVELOPMENT', 0); +define('DEVELOPMENT', 1); define('WRITE_LANG_TEMPLATE', DEVELOPMENT); define('SCRIPT_EXP_RELATIVE','install/'); @@ -163,7 +163,7 @@ $page_text = gt('Exponent is now upgrading the database definitions.'); break; case 'final': - $masthead = (isset($_REQUEST['upgrade']))?"Upgrade":"New Installation"; + $masthead = (isset($_REQUEST['upgrade']))?gt("Upgrade"):gt("New Installation"); $page_text = (isset($_REQUEST['upgrade']))?gt("Your upgrade is complete!"):gt("Your installation is complete!"); break; default: diff --git a/install/pages/admin_user.php b/install/pages/admin_user.php deleted file mode 100644 index 66b9c5d2b0..0000000000 --- a/install/pages/admin_user.php +++ /dev/null @@ -1,77 +0,0 @@ - -

- - - - -
- -
-
- : - -
- -
-
-
- : - -
- -
-
-
- : - -
- -
-
-
- : - -
-
- : - -
-
- : - -
-
- -
diff --git a/install/pages/final.php b/install/pages/final.php index d8c8331d33..4999db71f1 100644 --- a/install/pages/final.php +++ b/install/pages/final.php @@ -19,23 +19,30 @@ if (!defined('EXPONENT')) exit(''); -expSession::un_set('installer_config'); +//expSession::un_set('installer_config'); expSession::clearAllSessionData(); global $user; if (isset($_REQUEST['upgrade'])) { // upgrades hit this - if (unlink(BASE.'install/not_configured')) { +// if (unlink(BASE.'install/not_configured')) { + $leaveinstaller = (unlink(BASE.'install/not_configured')||!file_exists(BASE.'install/not_configured')); + if ($leaveinstaller) { echo '

' . gt('You\'re all set!') ."

"; echo '

' . gt('Take me to your leader') ."

"; } else { echo '

' . gt('Hmmmm....') ."

"; echo '

' . gt('We weren\'t able to remove /install/not_configured. Remove this file manually to complete your upgrade.') ."

"; } +?> +

+ +id!=0) { @@ -73,10 +80,10 @@
- +
- +
And: @@ -99,11 +106,5 @@ - - -

- - diff --git a/install/pages/install-5.php b/install/pages/install-5.php index 729489480b..e6ce484ea1 100644 --- a/install/pages/install-5.php +++ b/install/pages/install-5.php @@ -46,7 +46,7 @@ '; - echo file_exists(BASE . "themes/$file/sample.eql") ? '

' : ''; + echo file_exists(BASE . "themes/$file/sample.eql") ? '

' : ''; echo ''. '

'; echo "
"; diff --git a/install/pages/install-6.php b/install/pages/install-6.php index d201e56826..4630fdd111 100644 --- a/install/pages/install-6.php +++ b/install/pages/install-6.php @@ -23,15 +23,17 @@ ?>

- - + + + -
- - -
-
- : - -
- -
-
-
- : - -
- -
-
-
- : - -
- -
-
-
- : - -
-
- : - -
-
- : - -
-
- + + + +
+
+ : + +
+ +
+
+
+ : + +
+ +
+
+
+ : + +
+ +
+
+
+ : + +
+
+ : + +
+
+ : + +
+
+
diff --git a/install/pages/install-7.php b/install/pages/install-7.php index 16a108b7d7..e94e30cc6b 100644 --- a/install/pages/install-7.php +++ b/install/pages/install-7.php @@ -20,17 +20,33 @@ if (!defined('EXPONENT')) exit(''); global $db; +$error = false; +$lang = (defined('LANGUAGE')) ? "&lang='".LANGUAGE."'" : ''; $user = $db->selectObject('user','is_admin=1'); $user->username = $_POST['username']; -if ($user->username == '') { //FIXME Shouldn't get this because of check in install-6.php - echo gt('You must specify a valid username.'); +if ($user->username == '') { + $error = true; + $errorstr = gt('You must specify a valid username.'); + $errorflag = '&errusername=true'; + echo $errorstr; +} elseif ($_POST['password'] != $_POST['password2']) { + $error = true; + $errorstr = gt('Your passwords do not match. Please check your entries.'); + $errorflag = '&errpassword=true'; + echo $errorstr; +} elseif (!expValidator::validate_email_address($_POST['email'])) { + $error = true; + $errorstr = gt('Your email address is invalid. Please check your entry.'); + $errorflag = '&erremail=true'; + echo $errorstr; +} + +if ($error) { //FIXME Shouldn't get this because of check in install-6.php unless browser jscript disabled + flash('error',$errorstr); + header('Location: index.php?page=install-6'.$errorflag.$lang); + exit(); } else { - if (expValidator::validate_email_address($_POST['email']) == false) { - flash('error',gt('You must supply a valid email address.')); - header('Location: index.php?page=install-6&erremail=true'); - exit(); - } $user->password = md5($_POST['password']); $user->firstname = $_POST['firstname']; $user->lastname = $_POST['lastname']; @@ -43,8 +59,6 @@ }else{ $db->insertObject($user,'user'); } - $lang = (defined('LANGUAGE')) ? "&lang='".LANGUAGE."'" : ''; - header('Location: '.'index.php?page=final'.$lang); } diff --git a/install/pages/save_admin.php b/install/pages/save_admin.php deleted file mode 100644 index c9a6960029..0000000000 --- a/install/pages/save_admin.php +++ /dev/null @@ -1,50 +0,0 @@ -selectObject('user','is_admin=1'); - -$user->username = $_POST['username']; -if ($user->username == '') { - echo gt('You must specify a valid username.'); -} else { - if (expValidator::validate_email_address($_POST['email']) == false) { - flash('error',gt('You must supply a valid email address.')); - header('Location: index.php?page=admin_user&erremail=true'); - exit(); - } - $user->password = md5($_POST['password']); - $user->firstname = $_POST['firstname']; - $user->lastname = $_POST['lastname']; - $user->is_admin = 1; - $user->is_acting_admin = 1; - $user->email = $_POST['email']; - $user->created_on = time(); - if (isset($user->id)){ - $db->updateObject($user,'user'); - }else{ - $db->insertObject($user,'user'); - } - - header('Location: '.'index.php?page=final'); -} - -?> diff --git a/install/pages/setlang.php b/install/pages/setlang.php deleted file mode 100644 index f29236c30a..0000000000 --- a/install/pages/setlang.php +++ /dev/null @@ -1,43 +0,0 @@ - -

-

- -

- -
- - -
- -
- -
\ No newline at end of file diff --git a/install/pages/upgrade.php b/install/pages/upgrade.php deleted file mode 100644 index 20a0d50c3c..0000000000 --- a/install/pages/upgrade.php +++ /dev/null @@ -1,72 +0,0 @@ - -

- - - - - -checkVersion($_POST['from_version'])) { - echo ''; - echo ''; - } - } - } -} - -echo '
' . $upgradescript->name() . '' . $upgradescript->upgrade() . '
'; - -if (count($errors)) { - echo gt('Errors were encountered upgrading the site database.') . '


'; - foreach ($errors as $e) - echo $e . '
'; -} else { - echo gt('Upgrade Successful!'); - ; - echo '

' . gt('Complete the Upgrade') . ''; -} - -?> diff --git a/install/pages/upgrade_version.php b/install/pages/upgrade_version.php deleted file mode 100644 index 868d88eb4e..0000000000 --- a/install/pages/upgrade_version.php +++ /dev/null @@ -1,59 +0,0 @@ -'Gnarly Nebula', - '2.0.0 Beta 1'=>'Efficient Entropy', - '2.0.0 Beta 1.1'=>'Extremely Efficient Entropy', -); - -?> - -

- -
- -
- -
-

- -

-

- -

- -
diff --git a/install/upgrades/clear_cache.php b/install/upgrades/clear_cache.php index d1563f6f27..848b432f9e 100644 --- a/install/upgrades/clear_cache.php +++ b/install/upgrades/clear_cache.php @@ -55,9 +55,9 @@ function upgrade() { BASE.'tmp/css', // exponent minified css cache BASE.'tmp/minify', // minify cache BASE.'tmp/pixidou', // (new) pixidou cache - BASE.'tmp/rsscache', // magpierss cache - BASE.'tmp/views_c', // smarty cache - BASE.'tmp/cache', // alternate smarty cache + BASE.'tmp/rsscache', // SimplePie cache + BASE.'tmp/views_c', // smarty compiler cache + BASE.'tmp/cache', // smarty rendering cache (not currently active) BASE.'tmp/img_cache', // phpThumb cache includes subfolders BASE.'tmp/extensionuploads', // extensions are uploaded here, includes subfolders ); diff --git a/install/upgrades/fix_database.php b/install/upgrades/fix_database.php index e757b4ec04..48571e1755 100644 --- a/install/upgrades/fix_database.php +++ b/install/upgrades/fix_database.php @@ -33,7 +33,7 @@ class fix_database extends upgradescript { * name/title of upgrade script * @return string */ - function name() { return gt("Replace Missing Database Table Entries"); } + function name() { return gt("Repair/Replace Missing Database Table Entries"); } /** * generic description of upgrade script diff --git a/install/upgrades/remove_headlinecontroller.php b/install/upgrades/remove_headlinecontroller.php index 27a7396897..a9c1053ad5 100644 --- a/install/upgrades/remove_headlinecontroller.php +++ b/install/upgrades/remove_headlinecontroller.php @@ -46,7 +46,7 @@ function description() { return "Beginning with Exponent 2.0.0 Beta4, the Headli * @return bool */ function needed() { - return false; // TODO this line is set to false to disable this sample script + return false; // FIXME this line is set to false to disable this sample script } /** diff --git a/install/upgrades/version_tracking.php b/install/upgrades/version_tracking.php index ebe5feb1e3..8a777128d0 100644 --- a/install/upgrades/version_tracking.php +++ b/install/upgrades/version_tracking.php @@ -39,7 +39,7 @@ function name() { return gt("Update Version Information"); } * generic description of upgrade script * @return string */ - function description() { return "Beginning with Exponent 2.0.0 Beta3, the system keeps track of its versions and upgrades."; } + function description() { return "The system keeps track of its version for upgrades."; } /** * additional test(s) to see if upgrade script should be run