summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/users/edit.html.erb11
-rw-r--r--config/locales/en.rb3
2 files changed, 12 insertions, 2 deletions
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 0652ab2..18c3f4b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -69,10 +69,17 @@
</span>
<br />
</p>
-
+
+ <p>
+ <%= f.check_box :default_favorite_notifications %>
+ <%= f.label :default_favorite_notifications, t("views.users.default_favorite_notifications") %>
+ <span class="hint">
+ <%= t("views.users.describe_default_favorite_notifications") %>
+ </span>
+ </p>
<%= f.submit t("views.common.save") -%>
<% end -%>
<%- form_for(@user, :url => avatar_user_path, :html => {:id => "delete_avatar", :method => :delete}) do |f| -%>
-<%- end -%> \ No newline at end of file
+<%- end -%>
diff --git a/config/locales/en.rb b/config/locales/en.rb
index db1265c..ed51b36 100644
--- a/config/locales/en.rb
+++ b/config/locales/en.rb
@@ -229,6 +229,9 @@
:create_description => "Creating a user account allows you to create your own project or participate in the development of any project.",
:wants_email_notifications => 'Send email notifications?',
:describe_email_notifications => "We will send you an email notification when you receive a message in Gitorious",
+ :default_favorite_notifications => "By default notify me of updates in what I'm watching",
+ :describe_default_favorite_notifications => "By selecting this you will by default be notified by email when " +
+ "activities occur in what you're watching on Gitorious",
:member_for => "Member for",
:this_week => {
:one => "commit so far this week",