From 6ff5799bef1a5bf1fdb037f9ffb8053e916b136e Mon Sep 17 00:00:00 2001 From: jeson_peng Date: Mon, 11 Dec 2017 15:53:43 +0800 Subject: [PATCH] fix typo in new chinese support in emailtemplate, demo is ready at helpdesk.pengel.cn --- helpdesk/fixtures/emailtemplate.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpdesk/fixtures/emailtemplate.json b/helpdesk/fixtures/emailtemplate.json index 51b41589..7f35769f 100644 --- a/helpdesk/fixtures/emailtemplate.json +++ b/helpdesk/fixtures/emailtemplate.json @@ -1158,7 +1158,7 @@ "pk": 97, "model": "helpdesk.emailtemplate", "fields": { - "template_name": "已分配_CC", + "template_name": "assigned_cc", "html": "

您好,

\r\n\r\n

温馨提示, {{ ticket.submitter_email }}的工单 {{ ticket.ticket }} ({{ ticket.title }}) {% if ticket.assigned_to %}已经分配给 {{ ticket.assigned_to }}{% else %}还未分配{% endif %}.

\r\n\r\n

\r\n工单 ID: {{ ticket.ticket }}
\r\n待办: {{ queue.title }}
\r\n标题: {{ ticket.title }}
\r\n已打开: {{ ticket.created|date:\"l N jS Y, \\a\\t P\" }}
\r\n提交人: {{ ticket.submitter_email|default:\"Unknown\" }}
\r\n优先级: {{ ticket.get_priority_display }}
\r\n状态: {{ ticket.get_status }}
\r\n已分配给: {{ ticket.get_assigned_to }}
\r\n在线查看 更新此工单 (需要登录)

\r\n\r\n

原工单描述参考：:

\r\n\r\n
{{ ticket.description|linebreaksbr }}
", "plain_text": "您好,\r\n\r\n温馨提示, {{ ticket.submitter_email }}提交的工单 {{ ticket.ticket }} (\"{{ ticket.title }}\") 已经 {% if ticket.assigned_to %}分配给 {{ ticket.assigned_to }}{% else %}未分配{% endif %}.\r\n\r\n工单 ID: {{ ticket.ticket }}\r\n待办: {{ queue.title }}\r\n标题: {{ ticket.title }}\r\n已打开: {{ ticket.created|date:\"l N jS Y, \\a\\t P\" }}\r\n提交人: {{ ticket.submitter_email|default:\"Unknown\" }}\r\n优先级:{{ ticket.get_priority_display }}\r\n状态: {{ ticket.get_status }}\r\n已分配给: {{ ticket.get_assigned_to }}\r\n在线查看: {{ ticket.staff_url }}\r\n\r\n原始描述为:\r\n\r\n{{ ticket.description }}\r\n\r\n", "heading": "工单已分配", @@ -1278,7 +1278,7 @@ "pk": 107, "model": "helpdesk.emailtemplate", "fields": { - "template_name": "解决_cc", + "template_name": "resolved_cc", "html": "

您好,

\r\n\r\n

以下工单 已经 解决.

\r\n\r\n

\r\n工单 ID: {{ ticket.ticket }}
\r\n待办: {{ queue.title }}
\r\n标题: {{ ticket.title }}
\r\n已打开: {{ ticket.created|date:\"l N jS Y, \\a\\t P\" }}
\r\n提交人: {{ ticket.submitter_email|default:\"Unknown\" }}
\r\n优先级: {{ ticket.get_priority_display }}
\r\n状态: {{ ticket.get_status }}
\r\n已分配给: {{ ticket.get_assigned_to }}
\r\n在线查看 更新此工单 (需要登录)

\r\n\r\n

原工单描述参考：:

\r\n\r\n
{{ ticket.description|linebreaksbr }}
\r\n\r\n

增加的解决方案为:

\r\n\r\n
{{ ticket.resolution }}
\r\n\r\n

此方案已经 邮件发送给提交者, 在您关闭之前需要他先确认.

", "plain_text": "您好,\r\n\r\n以下工单 已经 解决:\r\n\r\n工单 ID: {{ ticket.ticket }}\r\n待办: {{ queue.title }}\r\n标题: {{ ticket.title }}\r\n已打开: {{ ticket.created|date:\"l N jS Y, \\a\\t P\" }}\r\n提交人: {{ ticket.submitter_email|default:\"Unknown\" }}\r\n优先级:{{ ticket.get_priority_display }}\r\n状态: {{ ticket.get_status }}\r\n已分配给: {{ ticket.get_assigned_to }}\r\n在线查看: {{ ticket.staff_url }} (需要登录)\r\n\r\n原始描述为:\r\n\r\n{{ ticket.description }}\r\n\r\n提供的解决方案为:\r\n\r\n{{ ticket.resolution }}\r\n\r\n此方案已经 邮件发送给提交者, 在您关闭之前需要他先确认.\r\n\r\n", "heading": "工单 解决", @@ -1290,7 +1290,7 @@ "pk": 108, "model": "helpdesk.emailtemplate", "fields": { - "template_name": "解决_owner", + "template_name": "resolved_owner", "html": "

您好,

\r\n\r\n

A 当前分配给您的工单已经 解决.

\r\n\r\n

\r\n工单 ID: {{ ticket.ticket }}
\r\n待办: {{ queue.title }}
\r\n标题: {{ ticket.title }}
\r\n已打开: {{ ticket.created|date:\"l N jS Y, \\a\\t P\" }}
\r\n提交人: {{ ticket.submitter_email|default:\"Unknown\" }}
\r\n优先级: {{ ticket.get_priority_display }}
\r\n状态: {{ ticket.get_status }}
\r\n已分配给: {{ ticket.get_assigned_to }}
\r\n在线查看 更新此工单 (需要登录)

\r\n\r\n

原工单描述参考：:

\r\n\r\n
{{ ticket.description|linebreaksbr }}
\r\n\r\n

增加的解决方案为:

\r\n\r\n
{{ ticket.resolution }}
\r\n\r\n

此方案已经 邮件发送给提交者, 在您关闭之前需要他先确认.

", "plain_text": "您好,\r\n\r\nA 当前分配给您的工单已经 解决.\r\n\r\n工单 ID: {{ ticket.ticket }}\r\n待办: {{ queue.title }}\r\n标题: {{ ticket.title }}\r\n已打开: {{ ticket.created|date:\"l N jS Y, \\a\\t P\" }}\r\n提交人: {{ ticket.submitter_email|default:\"Unknown\" }}\r\n优先级:{{ ticket.get_priority_display }}\r\n状态: {{ ticket.get_status }}\r\n已分配给: {{ ticket.get_assigned_to }}\r\n在线查看: {{ ticket.staff_url }} (需要登录)\r\n\r\n原始描述为:\r\n\r\n{{ ticket.description }}\r\n\r\n提供的方案为:\r\n\r\n{{ ticket.resolution }}\r\n\r\n此方案已经 邮件发送给提交者, 在您关闭之前需要他先确认.\r\n\r\n", "heading": "工单 解决", @@ -1302,7 +1302,7 @@ "pk": 109, "model": "helpdesk.emailtemplate", "fields": { - "template_name": "解决_submitter", + "template_name": "resolved_submitter", "html": "

您好,

\r\n\r\n

您最近记录了主题为{{ ticket.title }}的工单. 此邮件是要告知您解决方案.

\r\n\r\n

工单添加了以下解决方案 {{ ticket.ticket }}:

\r\n\r\n
{{ resolution }}
\r\n\r\n

请您确认下此解决方案是否解决了您的问题， 这样我们可以关闭此工单? 如果有更多问题或者认为方案不够充分，, 请继续使用邮件的主题回复此邮件.

\r\n\r\n

如果您想在线查看， 可以访问 {{ ticket.ticket_url }}.

", "plain_text": "您好,\r\n\r\n您最近记录了主题为\"{{ ticket.title }}\"的工单. 此邮件是要告知您解决方案.\r\n\r\n工单添加了以下解决方案 {{ ticket.ticket }}:\r\n\r\n{{ resolution }}\r\n\r\n请您确认下此解决方案是否解决了您的问题， 这样我们可以关闭此工单? 如果有更多问题或者认为方案不够充分，, 请继续使用邮件的主题回复此邮件.\r\n\r\n如果您想在线查看， 可以访问 {{ ticket.ticket_url }}\r\n\r\n", "heading": "您的 工单 已经 解决",