Download as
Browse Code »

Commit 0757181ef0165467e3f273d10157bb1971c091f2

Authored by AntonioTerceiro
1 parent 4a6afb41
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem79: using LanguageHelper in layout to translate TinyMCE 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@601 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 8 additions and 0 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @0757181
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 class ApplicationController < ActionController::Base 3 class ApplicationController < ActionController::Base
4 4
5 helper :document 5 helper :document
  6 + helper :language
6 7
7 design :holder => 'environment' 8 design :holder => 'environment'
8 9
app/views/layouts/application.rhtml
  Diff comments   View file @0757181
@@ -13,6 +13,12 @@ @@ -13,6 +13,12 @@
13 mode : "textareas", 13 mode : "textareas",
14 theme : "advanced", 14 theme : "advanced",
15 theme_advanced_toolbar_location : "top", 15 theme_advanced_toolbar_location : "top",
  16 + theme_advanced_layout_manager: 'SimpleLayout',
  17 + theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,undo,redo,separator,formatselect,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,separator,help",
  18 + theme_advanced_buttons2 : "",
  19 + theme_advanced_buttons3 : "",
  20 + apply_source_formatting : true,
  21 + language: <%= language.inspect %>,
16 }); 22 });
17 </script> 23 </script>
18 24
config/environment.rb
  Diff comments   View file @0757181
@@ -81,6 +81,7 @@ Comatose.configure do |config| @@ -81,6 +81,7 @@ Comatose.configure do |config|
81 config.admin_includes << :authenticated_system 81 config.admin_includes << :authenticated_system
82 config.admin_helpers << :application_helper 82 config.admin_helpers << :application_helper
83 config.admin_helpers << :document_helper 83 config.admin_helpers << :document_helper
  84 + config.admin_helpers << :language_helper
84 config.default_filter = '[No Filter]' 85 config.default_filter = '[No Filter]'
85 end 86 end
86 Comatose::AdminController.design :holder => 'environment' 87 Comatose::AdminController.design :holder => 'environment'