diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
commit | fe28193e4eb9af2dc5262535a29ffde5249568fc (patch) | |
tree | bd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /extra | |
parent | 9a986ac0a51fe844eee816325e6a6d4122136d9a (diff) | |
download | redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip |
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'extra')
-rw-r--r-- | extra/sample_plugin/app/controllers/example_controller.rb | 1 | ||||
-rw-r--r-- | extra/sample_plugin/config/locales/en.yml | 6 | ||||
-rw-r--r-- | extra/sample_plugin/config/locales/fr.yml | 6 | ||||
-rw-r--r-- | extra/sample_plugin/lang/en.yml | 5 | ||||
-rw-r--r-- | extra/sample_plugin/lang/fr.yml | 5 |
5 files changed, 13 insertions, 10 deletions
diff --git a/extra/sample_plugin/app/controllers/example_controller.rb b/extra/sample_plugin/app/controllers/example_controller.rb index 0c6cd5b91..8d63206af 100644 --- a/extra/sample_plugin/app/controllers/example_controller.rb +++ b/extra/sample_plugin/app/controllers/example_controller.rb @@ -4,6 +4,7 @@ class ExampleController < ApplicationController layout 'base' before_filter :find_project, :authorize + menu_item :sample_plugin def say_hello @value = Setting.plugin_sample_plugin['sample_setting'] diff --git a/extra/sample_plugin/config/locales/en.yml b/extra/sample_plugin/config/locales/en.yml new file mode 100644 index 000000000..5a010003b --- /dev/null +++ b/extra/sample_plugin/config/locales/en.yml @@ -0,0 +1,6 @@ +# Sample plugin +en: + label_plugin_example: Sample Plugin + label_meeting_plural: Meetings + text_say_hello: Plugin say 'Hello' + text_say_goodbye: Plugin say 'Good bye' diff --git a/extra/sample_plugin/config/locales/fr.yml b/extra/sample_plugin/config/locales/fr.yml new file mode 100644 index 000000000..1fae8e4e0 --- /dev/null +++ b/extra/sample_plugin/config/locales/fr.yml @@ -0,0 +1,6 @@ +# Sample plugin +fr: + label_plugin_example: Plugin exemple + label_meeting_plural: Meetings + text_say_hello: Plugin dit 'Bonjour' + text_say_goodbye: Plugin dit 'Au revoir' diff --git a/extra/sample_plugin/lang/en.yml b/extra/sample_plugin/lang/en.yml deleted file mode 100644 index c4005a764..000000000 --- a/extra/sample_plugin/lang/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample plugin -label_plugin_example: Sample Plugin -label_meeting_plural: Meetings -text_say_hello: Plugin say 'Hello' -text_say_goodbye: Plugin say 'Good bye' diff --git a/extra/sample_plugin/lang/fr.yml b/extra/sample_plugin/lang/fr.yml deleted file mode 100644 index 135050a5a..000000000 --- a/extra/sample_plugin/lang/fr.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample plugin -label_plugin_example: Plugin exemple -label_meeting_plural: Meetings -text_say_hello: Plugin dit 'Bonjour' -text_say_goodbye: Plugin dit 'Au revoir' |