Don't internationalize error messages used when defining a macro (#33426).

git-svn-id: http://svn.redmine.org/redmine/trunk@20015 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e89bc94c40a4162ff4011b95ecd10e6fb42f810c..8a881e51fa0b5e11dac3cd7335006361abe7a516 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1386,9 +1386,6 @@ ar:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 34e6b17bd34e40b1752cd6d2f3c9aaab1fcf288a..10de3df552257c6be56d7e5aa0229b01e88547a5 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1478,9 +1478,6 @@ az:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 81f81edbf21c31c376b55d78c970bd63ace1faa9..607d2ce9612e56beafc4db355d43276359bd8038 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1355,9 +1355,6 @@ bg:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 7394df919e2ee8b588976eba1254da8de247dc4b..f46874bf5820bc088bfc21f83526d2a1fbd33bcb 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1399,9 +1399,6 @@ bs:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 35e92436abf2ece919c450576bfd5868aac5a388..7415b689796799bd6871e52a636339ae08eafdbc 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1376,9 +1376,6 @@ ca:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3351f28f2f95c15f905957647f2db80536b90a7a..f3c470c0f93e8fe2a996c4b92be1ef73289636be 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1376,9 +1376,6 @@ cs:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 070a4195b9fb386096bc9a7e33c18c39858c5fe5..7cd659a96ce1161bc39825ec048faa54acd0ed4d 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1403,9 +1403,6 @@ da:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 330b11e5bfd8ac16831212c2adf0819779c2d156..2b150d95278edfbbdf6bf790df33e4dbfb000860 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1360,9 +1360,6 @@ de:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 2387b241d61e0154cd26bda08e0d13e737a77c38..2fff61add896fdd3ce0a39bd9a3b020d27284591 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1386,9 +1386,6 @@ el:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 925f8bfeb2a27e987e9d5f7b22910dcd52a2de21..90933acc21aef42bf2ee9ea43d2e6f8b10a7d942 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1387,9 +1387,6 @@ en-GB:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 559672371ab21af7a6be272c458b8ee436cddd1a..d11b6692b204cdff592e7d7bdf14e48095c075e2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -235,8 +235,6 @@ en:
   error_not_allowed_to_log_time_for_other_users: "You are not allowed to log time for other users"
   error_can_not_execute_macro_html: "Error executing the <strong>%{name}</strong> macro (%{error})"
   error_macro_does_not_accept_block: "This macro does not accept a block of text"
-  error_invalid_macro_name: "Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters are accepted)"
-  error_can_not_create_macro_without_block: "Can not create a macro without a block!"
   error_childpages_macro_no_argument: "With no argument, this macro can be called from wiki pages only"
   error_circular_inclusion: "Circular inclusion detected"
   error_page_not_found: "Page not found"

diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml
index 63c24e624a49cbefab863c49dfa3775f3f8dc8ca..46bd91395d01dc4dbccae675c313e788064a5922 100644 (file)
--- a/config/locales/es-PA.yml
+++ b/config/locales/es-PA.yml
@@ -1416,9 +1416,6 @@ es-PA:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 785c71fb71aa65c05586358b92a6fd91539416e1..e446ea5fb3de2de7f372fb05f9042874dbb7b97c 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1414,9 +1414,6 @@ es:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 7bac38d1c39837cb52ffcbdc97842dccf63fcea9..187f599e52322807981d8ca997e2707e797c3c60 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1391,9 +1391,6 @@ et:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index b1db8872ab5ce60397ac99bcd129786d377b53c3..d745e1d1f41e320f91d7a525c46446bc76b443f3 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1387,9 +1387,6 @@ eu:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index d4f4cf6610aceb13c170857f0a05487679dd5956..f6a093120acaf594e68ac635ec929194e2b71ee6 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1360,9 +1360,6 @@ fa:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ded033ddd50691a67da41d82e21c864851e4a9a2..be34efa43f08dfb2153f22a63c1cc6ed1b4d73aa 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1407,9 +1407,6 @@ fi:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b34a8da28af32952eb1edcafeb463adda37c07e9..78e700efd5225f28718ae886bbe52130109b757a 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1376,9 +1376,6 @@ fr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9367474d969c775b064bae8b5e8688b50926e276..96fbffbf89145531a456d02befadd35fdb751075 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1393,9 +1393,6 @@ gl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/he.yml b/config/locales/he.yml
index f30e1e002303abfd87c2ef39f25b6c7bce312228..4940b8cdce88b82a1bf796da497453b3a8b920df 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1391,9 +1391,6 @@ he:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 063fb641600dc093dbb19f804654f12e129e57bf..000ff8e59618a79446c9f0462ec93ce892adff60 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1383,9 +1383,6 @@ hr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1685e672e36e69bad1fdf95f834ddf4787a46ba2..2dfccc523abee49b10a26ee16c788e4ba8e28e02 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1405,9 +1405,6 @@
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 76717c77b9c942c86cd96b7bc605d642c7d1abe6..0848a6dc78e6ebcb99d24488a7de1d24ac4688db 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1388,9 +1388,6 @@ id:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 9cd19b7ab6683e39b5e00b482573ae7e4a75c5e6..85b8b6a237c0419ef21dfc3a5d72e0574949a229 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1379,9 +1379,6 @@ it:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 83cb4fb4a63fb40c7974775a4d58587ec8f9feea..470ca4f102bf4ed065b3327d4fc256be177992ff 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1362,9 +1362,6 @@ ja:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index adbcb210c5185905198a6e69111df46b25c6fef7..7a08295fc6d15709d76e15c893687c994a3038f4 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1424,9 +1424,6 @@ ko:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1f2b27b0df07da86473649a378e0c5acde39f729..289a29936d4a83be12baecc1fbd1f521b3168b39 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1376,9 +1376,6 @@ lt:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 57179433902b62585c625cdc70cf425eb6920413..e5b5e1b99290af9e5e3e3960ba1b70f02957e08b 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1380,9 +1380,6 @@ lv:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index f1d57e721379abaf116e272483e267fdd49a3656..443768d8bccde278c0eb87213690d187ebe47b54 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1386,9 +1386,6 @@ mk:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index eb8a743cd89a29442eb7cf34044e2544e10c26a3..ffc845076d5596540f3e576262389dad0e1a7f44 100644 (file)
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1386,9 +1386,6 @@ mn:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d7a98266a83dd59699a4c8c3478aa957d1738c7f..3b18ff60ed6a5c082c5b9f8559ade778a6f17627 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1361,9 +1361,6 @@ nl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/no.yml b/config/locales/no.yml
index fddd2a5895fc14f6e978a67d04824ec8f714fc39..47490903499bac4e666944bee2fcc14c148ed56f 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1376,9 +1376,6 @@
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 368e02cf73b54f7423200b47863a2ac6074c55fb..734dcc6eafca3f4fb27a8d12cc7c2e3e77c9f157 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1399,9 +1399,6 @@ pl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 563c4a9a1bc4569edea3a2d256bc7e3a6b47639b..14659f4a5c93231db6e210e061b3f474d0ffe686 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1391,9 +1391,6 @@ pt-BR:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index b02def5f6b2241b0731a0b27db0430a48b3c7a45..c59059498e8e922338b9ed126fed561d4d83f5b8 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1379,9 +1379,6 @@ pt:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 6b0f438f948dcf072153dda1cb167d193137ebce..5736a42e1c490e4a4fde8ccadb3b1ba2241d88bd 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1381,9 +1381,6 @@ ro:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 50a39357cfba83a730b4bf4c03ee7c5d8004cbe7..f9f467b53857fb4eefd1bb6ef8edf89bc69a25f5 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1471,9 +1471,6 @@ ru:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a908675942bfc874a616de3dda9d5aad062098d5..5f58694489805877585780efd117b1da2e6004ac 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1375,9 +1375,6 @@ sk:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f48108063bfe989157c9e5155f318b5a1d651800..56190b5229813421a12c212c011fedaca632d562 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1386,9 +1386,6 @@ sl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 85d73b4b144129ca3eedf76d41eaec1023a59b0a..d0065807cd07bf23c2acfecd3165e7b5401fe7c4 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1382,9 +1382,6 @@ sq:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 9c31c033092e2d12816e10b90bbfb6f347a1dc8a..e5a7fd7ff600f08c449acd45a04e5b730ecf4c5e 100644 (file)
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1388,9 +1388,6 @@ sr-YU:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 50b6edb973b6e426fe691b8f5468df42424dfabe..8e5f73613f171ce284cd49c81cb32fe6f3fe40d8 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1387,9 +1387,6 @@ sr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index f92fbfeccddae2252a6ba5c366a2d95038f642a7..2c50f3f322002a5a969c416040afd5660c5a3ec1 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1419,9 +1419,6 @@ sv:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 0c40c87a26bb53a43fab2f1c6bea065f80385125..1aff062e2427b105bd56aede406f23765ae57dd5 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1382,9 +1382,6 @@ th:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 948ca8a95789173a5800f10819ef9bcd42dcffc3..a70f0ed4530ee79fe5868b3bd4b2ebd7dbed34a6 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1393,9 +1393,6 @@ tr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5545921ba1076edd12bd757d7bdc1ad978989aaf..3b7e130956131a7b8fcd0c62c07a5b835297b23b 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1374,9 +1374,6 @@ uk:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 946fb9461945762f5258e9e69ba99fe5ab327497..7a325865dcda783f469a787e48ea51affecc13cc 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1438,9 +1438,6 @@ vi:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 2480efc08fef4708f97b15130ad5e9aacbe00df2..78d2857add9ffc45ec02b2d882af771f4d1ea8e3 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1424,9 +1424,6 @@
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 399bc95187dad7fc4444da9e8135f23319c15fe2..bd2f6285c52656fbb080721dbcd83e2a82604b44 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1363,9 +1363,6 @@ zh:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected

diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index 03eeecde9ba080fcf903145398d4306ec10fd0ef..db0a5ae01db600c1b0eb070c6d0b7409bbf59568 100644 (file)
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -152,10 +152,10 @@ module Redmine
         def macro(name, options={}, &block)
           options.assert_valid_keys(:desc, :parse_args)
           unless /\A\w+\z/.match?(name.to_s)
-            raise t(:error_invalid_macro_name, :name => name)
+            raise "Invalid macro name: #{name} (only 0-9, A-Z, a-z and _ characters are accepted)"
           end
           unless block_given?
-            raise t(:error_can_not_create_macro_without_block)
+            raise "Can not create a macro without a block!"
           end
           name = name.to_s.downcase.to_sym
           available_macros[name] = {:desc => @@desc || ''}.merge(options)