From e4f542d5cda552ec13b6b8d246d8eadf64ce53fc Mon Sep 17 00:00:00 2001 From: azett Date: Fri, 3 Jan 2020 19:23:30 +0100 Subject: [PATCH] Hereby, I solemnly declare "Administration area" the official designation for our backend. #39 shall be deemed to be settled :D --- fp-interface/lang/en-us/lang.admin.main.php | 39 +-- fp-interface/lang/en-us/lang.admin.php | 58 ++-- fp-interface/lang/en-us/lang.default.php | 363 ++++++++++---------- fp-plugins/adminarea/lang/lang.en-us.php | 20 +- fp-plugins/adminarea/plugin.adminarea.php | 42 +-- setup/lang/lang.en-us.php | 2 +- 6 files changed, 249 insertions(+), 275 deletions(-) diff --git a/fp-interface/lang/en-us/lang.admin.main.php b/fp-interface/lang/en-us/lang.admin.main.php index 681a6e2..fd6a8a2 100755 --- a/fp-interface/lang/en-us/lang.admin.main.php +++ b/fp-interface/lang/en-us/lang.admin.main.php @@ -1,23 +1,20 @@ 'Welcome to the control panel!', - 'descr' => 'Select an action', - - 'op1' => 'New Entry', - 'op1d' => 'Add a new entry', - 'op2' => 'Entries', - 'op2d' => 'Show and manage all the entries', - 'op3' => 'Widgets', - 'op3d' => 'Manage sidebar, bottombar and topbar widgets', - 'op4' => 'Plugins', - 'op4d' => 'Install, enable, disable plugins', - 'op5' => 'Configuration', - 'op5d' => 'Customize your flatpress', - 'op6' => 'Maintenance', - 'op6d' => 'Clean and restore flatpress', - - ); -?> +$lang ['admin'] ['main'] ['default'] = array( + 'head' => 'Welcome to the administration area!', + 'descr' => 'Select an action', + + 'op1' => 'New Entry', + 'op1d' => 'Add a new entry', + 'op2' => 'Entries', + 'op2d' => 'Show and manage all the entries', + 'op3' => 'Widgets', + 'op3d' => 'Manage sidebar, bottombar and topbar widgets', + 'op4' => 'Plugins', + 'op4d' => 'Install, enable, disable plugins', + 'op5' => 'Configuration', + 'op5d' => 'Customize your flatpress', + 'op6' => 'Maintenance', + 'op6d' => 'Clean and restore flatpress' +); diff --git a/fp-interface/lang/en-us/lang.admin.php b/fp-interface/lang/en-us/lang.admin.php index 6fa42a2..3a3d049 100755 --- a/fp-interface/lang/en-us/lang.admin.php +++ b/fp-interface/lang/en-us/lang.admin.php @@ -1,34 +1,32 @@ 'Main', - 'config' => 'Options', - //'users' => 'Users', - 'entry' => 'Entries', - 'static' => 'Statics', - 'uploader' => 'Uploader', - 'widgets' => 'Widgets', - //'add' => 'Add', - //'edit' => 'Edit/Delete', - 'maintain' => 'Maintain', - 'plugin' => 'Plugins', - 'themes' => 'Themes', - //'updates' => 'Updates', - ); - - - $lang['admin']['general'] = array( - 'id' => 'Id', # for entry ids - 'name' => 'Name', # for file names - 'title' => 'Title', # for entry/posts/static titles - 'comments' => '#Comms', - 'author' => 'Author', - 'actdel' => 'Delete', - 'actedit' => 'Edit', - 'actenable' => 'Enable', - 'actdisable'=> 'Disable' - ); +$lang ['admin'] ['panels'] = array( + 'main' => 'Main', + 'config' => 'Options', + // 'users' => 'Users', + 'entry' => 'Entries', + 'static' => 'Statics', + 'uploader' => 'Uploader', + 'widgets' => 'Widgets', + // 'add' => 'Add', + // 'edit' => 'Edit/Delete', + 'maintain' => 'Maintain', + 'plugin' => 'Plugins', + 'themes' => 'Themes' + // 'updates' => 'Updates', +); + +$lang ['admin'] ['general'] = array( + 'id' => 'Id', // for entry ids + 'name' => 'Name', // for file names + 'title' => 'Title', // for entry/posts/static titles + 'comments' => '#Comms', + 'author' => 'Author', + 'actdel' => 'Delete', + 'actedit' => 'Edit', + 'actenable' => 'Enable', + 'actdisable' => 'Disable' +); ?> diff --git a/fp-interface/lang/en-us/lang.default.php b/fp-interface/lang/en-us/lang.default.php index 3142108..d40f77b 100755 --- a/fp-interface/lang/en-us/lang.default.php +++ b/fp-interface/lang/en-us/lang.default.php @@ -1,201 +1,184 @@ 'Next Page »', - 'prevpage' => '« Previous Page', - 'entry' => 'Entry', - 'static' => 'Static page', - 'comment' => 'Comment', - 'preview' => 'Edit/Preview', - - 'filed_under' => 'Filed under ', - - 'add_entry' => 'Add Entry', - 'add_comment' => 'Add Comment', - 'add_static' => 'Add Static Page', - - 'btn_edit' => 'Edit', - 'btn_delete' => 'Delete', - - 'nocomments' => 'Add a comment', - 'comment' => '1 comment', - 'comments' => 'comments', - - ); - - $lang['search'] = array( - - 'head' => 'Search', - 'fset1' => 'Insert search criteria', - 'keywords' => 'Phrase', - 'onlytitles' => 'Only titles', - 'fulltext' => 'Full-text', - - 'fset2' => 'Date', - 'datedescr' => 'You can bind your search to a specific date. You may select an year, an year and a month, or a full date. '. - 'Leave blank to search the entire database.', - - 'fset3' => 'Search in categories', - 'catdescr' => 'Don\'t select any to search all', - - 'fset4' => 'Start Searching', - 'submit' => 'Search', - - 'headres' => 'Search Results', - 'descrres' => 'Searching for %s returned the following results:', - 'descrnores'=> 'Searching for %s returned no results.', - - 'moreopts' => 'More options', - - - 'searchag' => 'Search again', - - ); - - $lang['search']['error'] = array( - - 'keywords' => 'You must specify at least one keyword' - - ); - - - - - - $lang['entry'] = array(); - $lang['entry']['flags'] = array(); - - $lang['entry']['flags']['long'] = array( - 'draft' => 'Draft entry: hidden, awaiting publication', - //'static' => 'Static entry: normally hidden, to reach the entry put ?page=title-of-the-entry in url (experimental)', - 'commslock' => 'Comments locked: comments disallowed for this entry' - ); - - $lang['entry']['flags']['short'] = array( - 'draft' => 'Draft', - //'static' => 'Static', - 'commslock' => 'Comments locked' - ); + 'nextpage' => 'Next Page »', + 'prevpage' => '« Previous Page', + 'entry' => 'Entry', + 'static' => 'Static page', + 'comment' => 'Comment', + 'preview' => 'Edit/Preview', - $lang['404error'] = array( - 'subject' => 'Not Found', - 'content' => '

Sorry, we could not find the page you requested

' - ); - - // Login - $lang['login'] = array( - - 'head' => 'Login', - 'fieldset1' => 'Insert your user name and password', - 'user' => 'Username:', - 'pass' => 'Password:', - 'fieldset2' => 'Do login', - 'submit' => 'Login', - 'forgot' => 'Password lost' - ); - - $lang['login']['success'] = array( - 'success' => 'You are now logged in.', - 'logout' => 'You are now logged out.', - 'redirect' => 'You will be redirected in 5 seconds.', - 'opt1' => 'Back to index', - 'opt2' => 'Go to Control Panel', - 'opt3' => 'Add new entry' - ); - - $lang['login']['error'] = array( - 'user' => 'You must enter a username.', - 'pass' => 'You must enter a password.', - 'match' => 'Password incorrect.' - ); - - - $lang['comments'] = array( - 'head' => 'Add comment', - 'descr' => 'Fill out the form below to add your own comments', - 'fieldset1' => 'User data', - 'name' => 'Name (*)', - 'email' => 'Email:', - 'www' => 'Web:', - 'cookie' => 'Remember me', - 'fieldset2' => 'Add your comment', - 'comment' => 'Comment (*):', - 'fieldset3' => 'Send', - 'submit' => 'Add', - 'reset' => 'Reset', - 'success' => 'Your comment was added successfully', - 'nocomments' => 'This entry have not been commented yet', - 'commslock' => 'Comments have been disabled for this entry', - ); - - $lang['comments']['error'] = array( - 'name' => 'You must enter a name', - 'email' => 'You must enter a valid email', - 'www' => 'You must enter a valid URL', - 'comment' => 'You must enter a comment', - ); - - $lang['date']['month'] = array( - - 'January', - 'February', - 'March', - 'April', - 'May', - 'June', - 'July', - 'August', - 'September', - 'October', - 'November', - 'December' - - ); + 'filed_under' => 'Filed under ', - $lang['date']['month_abbr'] = array( - - 'Jan', - 'Feb', - 'Mar', - 'Apr', - 'May', - 'Jun', - 'Jul', - 'Aug', - 'Sep', - 'Oct', - 'Nov', - 'Dec' - - ); + 'add_entry' => 'Add Entry', + 'add_comment' => 'Add Comment', + 'add_static' => 'Add Static Page', - $lang['date']['weekday'] = array( - - 'Sunday', - 'Monday', - 'Tuesday', - 'Wednesday', - 'Thursday', - 'Friday', - 'Saturday', - - ); + 'btn_edit' => 'Edit', + 'btn_delete' => 'Delete', - $lang['date']['weekday_abbr'] = array( - - 'Sun', - 'Mon', - 'Tue', - 'Wed', - 'Thu', - 'Fri', - 'Sat', - - ); + 'nocomments' => 'Add a comment', + 'comment' => '1 comment', + 'comments' => 'comments' +); +$lang ['search'] = array( + 'head' => 'Search', + 'fset1' => 'Insert search criteria', + 'keywords' => 'Phrase', + 'onlytitles' => 'Only titles', + 'fulltext' => 'Full-text', + + 'fset2' => 'Date', + 'datedescr' => 'You can bind your search to a specific date. You may select an year, an year and a month, or a full date. ' . 'Leave blank to search the entire database.', + + 'fset3' => 'Search in categories', + 'catdescr' => 'Don\'t select any to search all', + + 'fset4' => 'Start Searching', + 'submit' => 'Search', + + 'headres' => 'Search Results', + 'descrres' => 'Searching for %s returned the following results:', + 'descrnores' => 'Searching for %s returned no results.', + + 'moreopts' => 'More options', + + 'searchag' => 'Search again' +); + +$lang ['search'] ['error'] = array( + + 'keywords' => 'You must specify at least one keyword' +); + +$lang ['entry'] = array(); +$lang ['entry'] ['flags'] = array(); + +$lang ['entry'] ['flags'] ['long'] = array( + 'draft' => 'Draft entry: hidden, awaiting publication', + // 'static' => 'Static entry: normally hidden, to reach the entry put ?page=title-of-the-entry in url (experimental)', + 'commslock' => 'Comments locked: comments disallowed for this entry' +); + +$lang ['entry'] ['flags'] ['short'] = array( + 'draft' => 'Draft', + // 'static' => 'Static', + 'commslock' => 'Comments locked' +); + +$lang ['404error'] = array( + 'subject' => 'Not Found', + 'content' => '

Sorry, we could not find the page you requested

' +); + +// Login +$lang ['login'] = array( + + 'head' => 'Login', + 'fieldset1' => 'Insert your user name and password', + 'user' => 'Username:', + 'pass' => 'Password:', + 'fieldset2' => 'Do login', + 'submit' => 'Login', + 'forgot' => 'Password lost' +); + +$lang ['login'] ['success'] = array( + 'success' => 'You are now logged in.', + 'logout' => 'You are now logged out.', + 'redirect' => 'You will be redirected in 5 seconds.', + 'opt1' => 'Back to index', + 'opt2' => 'Go to Admin Area', + 'opt3' => 'Add new entry' +); + +$lang ['login'] ['error'] = array( + 'user' => 'You must enter a username.', + 'pass' => 'You must enter a password.', + 'match' => 'Password incorrect.' +); + +$lang ['comments'] = array( + 'head' => 'Add comment', + 'descr' => 'Fill out the form below to add your own comments', + 'fieldset1' => 'User data', + 'name' => 'Name (*)', + 'email' => 'Email:', + 'www' => 'Web:', + 'cookie' => 'Remember me', + 'fieldset2' => 'Add your comment', + 'comment' => 'Comment (*):', + 'fieldset3' => 'Send', + 'submit' => 'Add', + 'reset' => 'Reset', + 'success' => 'Your comment was added successfully', + 'nocomments' => 'This entry have not been commented yet', + 'commslock' => 'Comments have been disabled for this entry' +); + +$lang ['comments'] ['error'] = array( + 'name' => 'You must enter a name', + 'email' => 'You must enter a valid email', + 'www' => 'You must enter a valid URL', + 'comment' => 'You must enter a comment' +); + +$lang ['date'] ['month'] = array( + + 'January', + 'February', + 'March', + 'April', + 'May', + 'June', + 'July', + 'August', + 'September', + 'October', + 'November', + 'December' +); + +$lang ['date'] ['month_abbr'] = array( + + 'Jan', + 'Feb', + 'Mar', + 'Apr', + 'May', + 'Jun', + 'Jul', + 'Aug', + 'Sep', + 'Oct', + 'Nov', + 'Dec' +); + +$lang ['date'] ['weekday'] = array( + + 'Sunday', + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday' +); + +$lang ['date'] ['weekday_abbr'] = array( + + 'Sun', + 'Mon', + 'Tue', + 'Wed', + 'Thu', + 'Fri', + 'Sat' +); ?> diff --git a/fp-plugins/adminarea/lang/lang.en-us.php b/fp-plugins/adminarea/lang/lang.en-us.php index e702394..fd023bb 100644 --- a/fp-plugins/adminarea/lang/lang.en-us.php +++ b/fp-plugins/adminarea/lang/lang.en-us.php @@ -1,14 +1,10 @@ 'Admin area', - 'welcome' => 'Welcome home, ', - 'admin_panel' => 'Admin panel', - 'add_entry' => 'Add entry', - 'add_static' => 'Add static', - 'logout' => 'Logout' - - ); - -?> \ No newline at end of file + 'subject' => 'Admin', + 'welcome' => 'Welcome home, ', + 'admin_panel' => 'Admin area', + 'add_entry' => 'Add entry', + 'add_static' => 'Add static', + 'logout' => 'Logout' +); \ No newline at end of file diff --git a/fp-plugins/adminarea/plugin.adminarea.php b/fp-plugins/adminarea/plugin.adminarea.php index 525809f..5d8d10c 100644 --- a/fp-plugins/adminarea/plugin.adminarea.php +++ b/fp-plugins/adminarea/plugin.adminarea.php @@ -1,35 +1,35 @@ {$lang['plugin']['adminarea']['welcome']} {$userid} !

- -END; +

{$lang['plugin']['adminarea']['welcome']} {$userid}!

+ + END; } else - $string = ''; - - $entry['subject'] = $lang['plugin']['adminarea']['subject']; - $entry['content'] = $string; + $string = ''; + + $entry ['subject'] = $lang ['plugin'] ['adminarea'] ['subject']; + $entry ['content'] = $string; return $entry; } diff --git a/setup/lang/lang.en-us.php b/setup/lang/lang.en-us.php index 94f4b2e..96f555b 100644 --- a/setup/lang/lang.en-us.php +++ b/setup/lang/lang.en-us.php @@ -153,7 +153,7 @@ Want to see more? [h4]And what now?[/h4] -Now you can [url=login.php]Login[/url] to get to the [url=admin.php]Control Panel[/url] and start posting! +Now you can [url=login.php]Login[/url] to get to the [url=admin.php]Administration Area[/url] and start posting! Have fun! :)