# HG changeset patch # User luisf # Date 1290513001 0 # Node ID 65d9e2cabaa3bf973e855749a9920e056d170d07 # Parent 6c19f4f0542cb73dff915f35ffd1cda085a39080 Added tipoftheday to the config/settings in order to correct previous issues. Tip of the day is now working correctly. Added the heading strings to the locales files. diff -r 6c19f4f0542c -r 65d9e2cabaa3 app/views/settings/_general.rhtml --- a/app/views/settings/_general.rhtml Mon Nov 22 15:28:45 2010 +0000 +++ b/app/views/settings/_general.rhtml Tue Nov 23 11:50:01 2010 +0000 @@ -7,7 +7,7 @@ <%= wikitoolbar_for 'settings_welcome_text' %>

<%= setting_text_area :tipoftheday_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %>

-<%= wikitoolbar_for 'tipoftheday_text' %> + <%= wikitoolbar_for 'tipoftheday_text' %>

<%= setting_text_field :attachment_max_size, :size => 6 %> KB

diff -r 6c19f4f0542c -r 65d9e2cabaa3 app/views/welcome/index.rhtml --- a/app/views/welcome/index.rhtml Mon Nov 22 15:28:45 2010 +0000 +++ b/app/views/welcome/index.rhtml Tue Nov 23 11:50:01 2010 +0000 @@ -4,9 +4,10 @@ <%= textilizable Setting.welcome_text %> - -

Tip of The Day

- <%= textilizable Setting.tipoftheday_text %> +
+

<%=l(:label_tipoftheday)%>

+ <%= textilizable Setting.tipoftheday_text %> +
<% if @news.any? %>
diff -r 6c19f4f0542c -r 65d9e2cabaa3 config/locales/en-GB.yml --- a/config/locales/en-GB.yml Mon Nov 22 15:28:45 2010 +0000 +++ b/config/locales/en-GB.yml Tue Nov 23 11:50:01 2010 +0000 @@ -291,6 +291,7 @@ setting_app_title: Application title setting_app_subtitle: Application subtitle setting_welcome_text: Welcome text + setting_tipoftheday_text: Tip of the Day setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration @@ -406,6 +407,7 @@ project_module_repository: Repository project_module_boards: Boards + label_tipoftheday: Tip of the day label_user: User label_user_plural: Users label_user_new: New user @@ -926,8 +928,8 @@ setting_default_notification_option: Default notification option label_user_mail_option_only_my_events: Only for things I watch or I'm involved in label_user_mail_option_only_assigned: Only for things I am assigned to - notice_not_authorized_archived_project: The project you're trying to access has been archived. + notice_not_authorized_archived_project: The project you're trying to access has been archived. label_principal_search: "Search for user or group:" label_user_search: "Search for user:" - field_visible: Visible - setting_emails_header: Emails header + field_visible: Visible + setting_emails_header: Emails header diff -r 6c19f4f0542c -r 65d9e2cabaa3 config/locales/en.yml --- a/config/locales/en.yml Mon Nov 22 15:28:45 2010 +0000 +++ b/config/locales/en.yml Tue Nov 23 11:50:01 2010 +0000 @@ -302,7 +302,7 @@ setting_app_title: Application title setting_app_subtitle: Application subtitle setting_welcome_text: Welcome text - setting_welcome_text: Tip of the Day + setting_tipoftheday_text: Tip of the Day setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration @@ -423,6 +423,7 @@ project_module_calendar: Calendar project_module_gantt: Gantt + label_tipoftheday: Tip of the day label_user: User label_user_plural: Users label_user_new: New user diff -r 6c19f4f0542c -r 65d9e2cabaa3 config/settings.yml --- a/config/settings.yml Mon Nov 22 15:28:45 2010 +0000 +++ b/config/settings.yml Tue Nov 23 11:50:01 2010 +0000 @@ -25,6 +25,8 @@ default: Project management welcome_text: default: +tipoftheday_text: + default: login_required: default: 0 self_registration: