Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #350 from kubabrecka/extract_strings3 

some more extracted strings for translation
This commit is contained in:
Sam 2013-03-04 04:36:31 -08:00
parent af865ee223 9bf5e31f94
commit e6ffc07745
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_notifications/digest.text.erb
View File

@ -23,7 +23,7 @@
<%=raw(t :'user_notifications.digest.unsubscribe', <%=raw(t :'user_notifications.digest.unsubscribe',
site_link: site_link, site_link: site_link,
unsubscribe_link: raw(@markdown_linker.create('click here', email_unsubscribe_path(key: @user.temporary_key)))) %> unsubscribe_link: raw(@markdown_linker.create(t('user_notifications.digest.click_here'), email_unsubscribe_path(key: @user.temporary_key)))) %>
<%= raw(@markdown_linker.references) %> <%= raw(@markdown_linker.references) %>

2
app/views/users/omniauth_callbacks/failure.html.erb
View File

@ -5,7 +5,7 @@
</div> </div>
<%else%> <%else%>
<div class='alert alert-error'> <div class='alert alert-error'>
Something went wrong processing your log in, please try again. <% t 'login.omniauth_error_unknown' %>
</div> </div>
<%end%> <%end%>
</div> </div>

2
config/locales/server.en.yml
View File

@ -455,6 +455,7 @@ en:
errors: "%{errors}" errors: "%{errors}"
not_available: "Not available. Try %{suggestion}?" not_available: "Not available. Try %{suggestion}?"
omniauth_error: "Sorry, there was an error authorizing your %{strategy} account. Perhaps you did not approve authorization?" omniauth_error: "Sorry, there was an error authorizing your %{strategy} account. Perhaps you did not approve authorization?"
omniauth_error_unknown: "Something went wrong processing your log in, please try again."
user: user:
@ -707,6 +708,7 @@ en:
new_activity: "New activity on your topics and posts:" new_activity: "New activity on your topics and posts:"
new_topics: "New topics:" new_topics: "New topics:"
unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you in a while.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}." unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you in a while.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}."
click_here: "click here"
private_message: private_message:
subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}" subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"