From 0381efbd3bb6f38d53250a488b121e2ae36bc290 Mon Sep 17 00:00:00 2001 From: Sem Date: Fri, 6 Jul 2012 05:18:14 +0200 Subject: Refs #1852. Tinymce detects if site language is installed in its languages path. --- mod/tinymce/start.php | 12 ++++++++++++ mod/tinymce/views/default/js/tinymce.php | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'mod/tinymce') diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php index 48625f456..6aba837e0 100644 --- a/mod/tinymce/start.php +++ b/mod/tinymce/start.php @@ -33,3 +33,15 @@ function tinymce_longtext_menu($hook, $type, $items, $vars) { return $items; } + +function tinymce_get_site_language() { + + if ($site_language = elgg_get_config('language')) { + $path = elgg_get_plugins_path() . "tinymce/vendor/tinymce/jscripts/tiny_mce/langs"; + if (file_exists("$path/$site_language.js")) { + return $site_language; + } + } + + return 'en'; +} diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php index e6e2865a5..51e99c223 100644 --- a/mod/tinymce/views/default/js/tinymce.php +++ b/mod/tinymce/views/default/js/tinymce.php @@ -38,6 +38,7 @@ elgg.tinymce.init = function() { mode : "specific_textareas", editor_selector : "elgg-input-longtext", theme : "advanced", + language : "", plugins : "lists,spellchecker,autosave,fullscreen,paste", relative_urls : false, remove_script_host : false, @@ -86,4 +87,4 @@ elgg.tinymce.init = function() { } } -elgg.register_hook_handler('init', 'system', elgg.tinymce.init); \ No newline at end of file +elgg.register_hook_handler('init', 'system', elgg.tinymce.init); -- cgit v1.2.3 From 8e3a2760ef88077aa04dc1905f5bce0348bdb3d7 Mon Sep 17 00:00:00 2001 From: Sem Date: Fri, 6 Jul 2012 05:59:11 +0200 Subject: Refs #1852. Added admin notice on activate. --- mod/tinymce/activate.php | 14 ++++++++++++++ mod/tinymce/languages/en.php | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 mod/tinymce/activate.php (limited to 'mod/tinymce') diff --git a/mod/tinymce/activate.php b/mod/tinymce/activate.php new file mode 100644 index 000000000..953e3c25b --- /dev/null +++ b/mod/tinymce/activate.php @@ -0,0 +1,14 @@ + "Remove editor", 'tinymce:add' => "Add editor", 'tinymce:word_count' => 'Word count: ', + 'tinymce:lang_notice' => "Your site language is %s but it isn't installed for TinyMCE. Get it here and copy it in %s path. Then, flush the caches.", ); -add_translation("en", $english); \ No newline at end of file +add_translation("en", $english); -- cgit v1.2.3 From 28e28ec8b23d8077194704ace9584fd4f742f2ce Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 6 Jul 2012 07:52:28 -0400 Subject: Refs #1852 adds readme with language instructions for TinyMCE --- mod/tinymce/README.txt | 10 ++++++++++ mod/tinymce/activate.php | 2 +- mod/tinymce/languages/en.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 mod/tinymce/README.txt (limited to 'mod/tinymce') diff --git a/mod/tinymce/README.txt b/mod/tinymce/README.txt new file mode 100644 index 000000000..2814e9390 --- /dev/null +++ b/mod/tinymce/README.txt @@ -0,0 +1,10 @@ +Adding a language +====================== +1. Download the language pack from [TinyMCE][1] +2. Extract the files from the zip file. +3. Copy the langs, plugins, and themes directories into mod/tinymce/vendor/tinymce/jscripts/tiny_mce/. +There are already directories with those names. You do not want to delete those directories. +Instead, copy the new directories on top of the old ones. +4. Flush the Elgg caches. + +[1]: http://www.tinymce.com/i18n/index.php?ctrl=lang&act=download "TinyMCE" diff --git a/mod/tinymce/activate.php b/mod/tinymce/activate.php index 953e3c25b..6f5cc8d50 100644 --- a/mod/tinymce/activate.php +++ b/mod/tinymce/activate.php @@ -7,7 +7,7 @@ if (elgg_get_config('language') != tinymce_get_site_language()) { $message = elgg_echo('tinymce:lang_notice', array( elgg_echo(elgg_get_config('language')), "http://www.tinymce.com/i18n/index.php?ctrl=lang&act=download", - elgg_get_plugins_path() . "tinymce/vendor/tinymce/jscripts/tiny_mce", + elgg_get_plugins_path() . "tinymce/vendor/tinymce/jscripts/tiny_mce/", elgg_add_action_tokens_to_url(elgg_normalize_url('action/admin/site/flush_cache')), )); elgg_add_admin_notice('tinymce_admin_notice_no_lang', $message); diff --git a/mod/tinymce/languages/en.php b/mod/tinymce/languages/en.php index 293e68b35..b2702549c 100644 --- a/mod/tinymce/languages/en.php +++ b/mod/tinymce/languages/en.php @@ -9,7 +9,7 @@ $english = array( 'tinymce:remove' => "Remove editor", 'tinymce:add' => "Add editor", 'tinymce:word_count' => 'Word count: ', - 'tinymce:lang_notice' => "Your site language is %s but it isn't installed for TinyMCE. Get it here and copy it in %s path. Then, flush the caches.", + 'tinymce:lang_notice' => "Your site language is %s but it isn't installed for TinyMCE. Get it here and copy it to %s. Then, flush the caches. See the TinyMCE README for more details.", ); add_translation("en", $english); -- cgit v1.2.3