jro_apps/redmine Commit - r4364:bd8e8bc71b71

Fixed: error when sending notification on wiki edit for bg, es, zh-TW locales (#7024)....

Jean-Philippe Lang -

r4364:bd8e8bc71b71

parent child

Context file:

r4364:bd8e8bc71b71

Collapse all files

config/locales/bg.yml +4 -4

               text_wiki_page_destroy_children: Изтриване на страниците деца и всички техни descendants
               setting_password_min_length: Минимална дължина на парола
               field_group_by: Групиране на резултатите по
-              mail_subject_wiki_content_updated: "Wiki страницата '{{id}}' не беше обновена"
+              mail_subject_wiki_content_updated: "Wiki страницата '{{page}}' не беше обновена"
               label_wiki_content_added: Wiki страница беше добавена
-              mail_subject_wiki_content_added: "Wiki страницата '{{id}}' беше добавена"
+              mail_subject_wiki_content_added: "Wiki страницата '{{page}}' беше добавена"
-              mail_body_wiki_content_added: Wiki страницата '{{id}}' беше добавена от {{author}}.
+              mail_body_wiki_content_added: Wiki страницата '{{page}}' беше добавена от {{author}}.
               label_wiki_content_updated: Wiki страница беше обновена
-              mail_body_wiki_content_updated: Wiki страницата '{{id}}' беше обновена от {{author}}.
+              mail_body_wiki_content_updated: Wiki страницата '{{page}}' беше обновена от {{author}}.
               permission_add_project: Създаване на проект
               setting_new_project_user_role_id: Роля, давана на потребител, създаващ проекти, който не е администратор
               label_view_all_revisions: Разглеждане на всички ревизии

config/locales/es.yml +4 -4

               text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes
               setting_password_min_length: Longitud mínima de la contraseña
               field_group_by: Agrupar resultados por
-              mail_subject_wiki_content_updated: "La página wiki '{{id}}' ha sido actualizada"
+              mail_subject_wiki_content_updated: "La página wiki '{{page}}' ha sido actualizada"
               label_wiki_content_added: Página wiki añadida
-              mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{id}}'."
+              mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{page}}'."
-              mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{id}}'."
+              mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{page}}'."
               label_wiki_content_updated: Página wiki actualizada
-              mail_body_wiki_content_updated: La página wiki '{{id}}' ha sido actualizada por {{author}}.
+              mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
               permission_add_project: Crear proyecto
               setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
               label_view_all_revisions: Ver todas las revisiones

config/locales/zh-TW.yml +4 -4

               mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核："
               mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})"
               mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期："
-              mail_subject_wiki_content_added: "'{{id}}' wiki 頁面已被新增"
+              mail_subject_wiki_content_added: "'{{page}}' wiki 頁面已被新增"
-              mail_body_wiki_content_added: "The '{{id}}' wiki 頁面已被 {{author}} 新增。"
+              mail_body_wiki_content_added: "The '{{page}}' wiki 頁面已被 {{author}} 新增。"
-              mail_subject_wiki_content_updated: "'{{id}}' wiki 頁面已被更新"
+              mail_subject_wiki_content_updated: "'{{page}}' wiki 頁面已被更新"
-              mail_body_wiki_content_updated: "The '{{id}}' wiki 頁面已被 {{author}} 更新。"
+              mail_body_wiki_content_updated: "The '{{page}}' wiki 頁面已被 {{author}} 更新。"
               gui_validation_error: 1 個錯誤
               gui_validation_error_plural: "{{count}} 個錯誤"

test/unit/mailer_test.rb +20 0

@@ -305,6 +305,26 class MailerTest < ActiveSupport::TestCase
305	end	305	end
306	end	306	end
307		307
		308	def test_wiki_content_added
		309	content = WikiContent.find(:first)
		310	valid_languages.each do \|lang\|
		311	Setting.default_language = lang.to_s
		312	assert_difference 'ActionMailer::Base.deliveries.size' do
		313	assert Mailer.deliver_wiki_content_added(content)
		314	end
		315	end
		316	end
		317
		318	def test_wiki_content_updated
		319	content = WikiContent.find(:first)
		320	valid_languages.each do \|lang\|
		321	Setting.default_language = lang.to_s
		322	assert_difference 'ActionMailer::Base.deliveries.size' do
		323	assert Mailer.deliver_wiki_content_updated(content)
		324	end
		325	end
		326	end
		327
308	def test_account_information	328	def test_account_information
309	user = User.find(2)	329	user = User.find(2)
310	valid_languages.each do \|lang\|	330	valid_languages.each do \|lang\|

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages