i18n last merge

app/views/stockit/_destroy_fail.js.haml

@@ -1,5 +1,5 @@
 -# please polish the following line if you know how, same in view destroy
-var errorDiv = $('<div class="alert fade in alert-error"><a class="close" data-dismiss="alert" href="#">x</a></div>');
+var errorDiv = $('<div class="alert fade in alert-error"><a class="close" data-dismiss="alert" href="#">#{t('ui.marks.close')}</a></div>');
 
 errorDiv.append(document.createTextNode('#{j(fail_msg)}'));
 $('div.container-fluid').prepend(errorDiv);

app/views/stockit/destroy.js.haml

@@ -1,7 +1,7 @@
 -# please polish the following line if you know how, same in partial _destroy_fail
-var successDiv = $('<div class="alert fade in alert-success"><a class="close" data-dismiss="alert" href="#">x</a></div>');
+var successDiv = $('<div class="alert fade in alert-success"><a class="close" data-dismiss="alert" href="#">#{escape_javascript(t('ui.marks.close'))}</a></div>');
 
-successDiv.append(document.createTextNode('Artikel #{j(@article.name)} gelöscht.'));
+successDiv.append(document.createTextNode('#{escape_javascript(t('.notice', name: @article.name))}'));
 $('div.container-fluid').prepend(successDiv);
 
 -# WARNING: If you try to use the escape j(...) here, an error occurs:

config/locales/de/de.stockit.yml

@@ -29,6 +29,8 @@ de:
     new:
       title: 'Neuen Lagerartikel anlegen'
       search_text: 'Suche nache Artikeln aus allen Katalogen:'
+    destroy:
+      notice: 'Artikel %{name} gelöscht.'
     
     # used by controller
     stock_create:
@@ -39,4 +41,3 @@ de:
     # used by model
     check:
       not_empty: '%{name} kann nicht gelöscht werden. Der Lagerbestand ist nicht null.'
-      

config/locales/en/en.stockit.yml

@@ -29,6 +29,8 @@ en:
     new:
       title: 'Add new stock article'
       search_text: 'Search for articles in all catalogues:'
+    destroy:
+      notice: 'Article %{name} was deleted.'
     
     # used by controller
     stock_create: