Skip to content

Commit 191fa59

Browse files
PoffenPoffen
committed
Cleaning up Gettext elements in admin parser view file
1 parent e64445e commit 191fa59

File tree

5 files changed

+139
-70
lines changed

5 files changed

+139
-70
lines changed

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,16 @@ public function __construct()
2727

2828
public function display($req, $res, $args)
2929
{
30-
global $lang_admin_parser;
31-
3230
Container::get('hooks')->fire('controller.admin.parser.display');
3331

34-
// Legacy
35-
require ForumEnv::get('FEATHER_ROOT') . 'featherbb/lang/' . User::getPref('language') . '/admin/parser.php';
36-
3732
// This is where the parser data lives and breathes.
3833
$cache_file = ForumEnv::get('FEATHER_ROOT').'cache/cache_parser_data.php';
3934

4035
// If RESET button pushed, or no cache file, re-compile master bbcode source file.
4136
if (Input::post('reset') || !file_exists($cache_file)) {
4237
require_once(ForumEnv::get('FEATHER_ROOT').'featherbb/Core/parser/bbcd_source.php');
4338
require_once(ForumEnv::get('FEATHER_ROOT').'featherbb/Core/parser/bbcd_compile.php');
44-
return Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['reset_success']);
39+
return Router::redirect(Router::pathFor('adminParser'), _e('reset_success'));
4540
}
4641

4742
// Load the current BBCode $pd array from featherbb/Core/parser/parser_data.inc.php.
@@ -64,28 +59,28 @@ public function display($req, $res, $args)
6459
if (preg_match('%^image/%', $f['type'])) { // If we have an image file type?
6560
if ($f['size'] > 0 && $f['size'] <= ForumSettings::get('o_avatars_size')) {
6661
if (move_uploaded_file($f['tmp_name'], ForumEnv::get('FEATHER_ROOT') .'style/img/smilies/'. $name)) {
67-
return Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['upload success']);
62+
return Router::redirect(Router::pathFor('adminParser'), _e('upload success'));
6863
} else { // Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
69-
throw new Error($lang_admin_parser['upload_err_1'], 500);
64+
throw new Error(_e('upload_err_1'), 500);
7065
}
7166
} else { // Error #2: 'Smiley upload failed. File is too big.'
72-
throw new Error($lang_admin_parser['upload_err_2'], 400);
67+
throw new Error(_e('upload_err_2'), 400);
7368
}
7469
} else { // Error #3: 'Smiley upload failed. File type is not an image.'.
75-
throw new Error($lang_admin_parser['upload_err_3'], 400);
70+
throw new Error(_e('upload_err_3'), 400);
7671
}
7772
} else { // Error #4: 'Smiley upload failed. Bad filename.'
78-
throw new Error($lang_admin_parser['upload_err_4'], 400);
73+
throw new Error(_e('upload_err_4'), 400);
7974
}
8075
break;
8176
case 1: // case 1 similar to case 2 so fall through...
82-
case 2: throw new Error($lang_admin_parser['upload_err_2'], 400); // File exceeds MAX_FILE_SIZE.
83-
case 3: throw new Error($lang_admin_parser['upload_err_5'], 400); // File only partially uploaded.
77+
case 2: throw new Error(_e('upload_err_2'), 400); // File exceeds MAX_FILE_SIZE.
78+
case 3: throw new Error(_e('upload_err_5'), 400); // File only partially uploaded.
8479
// case 4: break; // No error. Normal response when this form element left empty
85-
case 4: throw new Error($lang_admin_parser['upload_err_6'], 400); // No filename.
86-
case 6: throw new Error($lang_admin_parser['upload_err_7'], 500); // No temp folder.
87-
case 7: throw new Error($lang_admin_parser['upload_err_8'], 500); // Cannot write to disk.
88-
default: throw new Error($lang_admin_parser['upload_err_9'], 500); // Generic/unknown error
80+
case 4: throw new Error(_e('upload_err_6'), 400); // No filename.
81+
case 6: throw new Error(_e('upload_err_7'), 500); // No temp folder.
82+
case 7: throw new Error(_e('upload_err_8'), 500); // Cannot write to disk.
83+
default: throw new Error(_e('upload_err_9'), 500); // Generic/unknown error
8984
}
9085
}
9186

@@ -198,7 +193,7 @@ public function display($req, $res, $args)
198193
}
199194

200195
require_once('featherbb/Core/parser/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
201-
return Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['save_success']);
196+
return Router::redirect(Router::pathFor('adminParser'), _e('save_success'));
202197
}
203198

204199
AdminUtils::generateAdminMenu('parser');
@@ -207,7 +202,7 @@ public function display($req, $res, $args)
207202
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Parser')),
208203
'active_page' => 'admin',
209204
'admin_console' => true,
210-
'lang_admin_parser' => $lang_admin_parser,
205+
'tag_summary' => $this->model->tagSummary(),
211206
'smiley_files' => $this->model->get_smiley_files(),
212207
'bbcd' => $bbcd,
213208
'config' => $config,

‎featherbb/Model/Admin/Parser.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,29 @@ public function get_smiley_files()
2727
$imgfiles = Container::get('hooks')->fire('model.admin.parser.get_smiley_files.imgfiles', $imgfiles);
2828
return $imgfiles;
2929
}
30+
31+
// Array of BBCode text (title) elements
32+
public function tagSummary() {
33+
$tagSummary = array(
34+
'unknown' => 'Unrecognized Tag',
35+
'code' => 'Computer Code',
36+
'quote' => 'Block Quotation',
37+
'list' => 'Ordered or Unordered',
38+
'*' => 'List Item',
39+
'h' => 'Header 5',
40+
'img' => 'Inline Image',
41+
'url' => 'Hypertext Link',
42+
'b' => 'Strong Emphasis',
43+
'i' => 'Emphasis',
44+
's' => 'Strike-through',
45+
'u' => 'Underlined Text',
46+
'color' => 'Color',
47+
'tt' => 'Teletype Text',
48+
'center' => 'Centered Block',
49+
'err' => 'Error Codes',
50+
);
51+
$tagSummary = Container::get('hooks')->fire('model.admin.parser.tagSummary.tagSummary', $tagSummary);
52+
53+
return $tagSummary;
54+
}
3055
}

0 commit comments

Comments
 (0)