Merge pull request #84 from MasatoIso/masatoiso

ラベルの変数名を修正
EC-CUBE · Sep 30, 2019 · 1dae04d · 1dae04d
2 parents 69fd068 + fd53a9c
commit 1dae04d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Resource/template/admin/history_list.twig b/Resource/template/admin/history_list.twig
@@ -162,10 +162,10 @@ $(function () {
                                                                 </div>
                                                                 <div class="modal-footer">
                                                                     <button type="button" class="btn btn-ec-regular" data-dismiss="modal">
-                                                                        {{ 'common.label.cancel'|trans }}
+                                                                        {{ 'common.cancel'|trans }}
                                                                     </button>
                                                                     <button type="submit" class="btn btn-ec-delete" onclick="document.form1.action = '{{ url('plugin_mail_magazine_history_delete', { id: SendHistory.id }) }}'">
-                                                                        {{ 'common.label.execute'|trans }}
+                                                                        {{ 'common.delete'|trans }}
                                                                     </button>
                                                                 </div>
                                                             </div>

diff --git a/Resource/template/admin/template_list.twig b/Resource/template/admin/template_list.twig
@@ -66,11 +66,11 @@
                                                     </div>
                                                     <div class="modal-footer">
                                                         <button type="button" class="btn btn-ec-regular" data-dismiss="modal">
-                                                            {{ 'common.label.cancel'|trans }}
+                                                            {{ 'common.cancel'|trans }}
                                                         </button>
                                                         <form action="{{ url('plugin_mail_magazine_template_delete', { id: Template.id }) }}" method="post" enctype="application/x-www-form-urlencoded">
                                                             <button type="submit" class="btn btn-ec-delete">
-                                                                {{ 'common.label.execute'|trans }}
+                                                                {{ 'common.delete'|trans }}
                                                             </button>
                                                         </form>
                                                     </div>