Browse Source

set current locale to 'default' if not specified (#131)

Andreas Stenius 11 years ago
parent
commit
73b36c138e
2 changed files with 4 additions and 4 deletions
  1. 1 1
      src/erlydtl_beam_compiler.erl
  2. 3 3
      test/erlydtl_test_defs.erl

+ 1 - 1
src/erlydtl_beam_compiler.erl

@@ -500,7 +500,7 @@ options_match_ast(Context) ->
 options_match_ast(Context, TreeWalker) ->
     [
      ?Q("_TranslationFun = proplists:get_value(translation_fun, RenderOptions, none)"),
-     ?Q("_CurrentLocale = proplists:get_value(locale, RenderOptions, none)"),
+     ?Q("_CurrentLocale = proplists:get_value(locale, RenderOptions, default)"),
      ?Q("_RecordInfo = _@info", [{info, merl:term(Context#dtl_context.record_info)}])
      | case call_extension(Context, setup_render_ast, [Context, TreeWalker]) of
            undefined -> [];

+ 3 - 3
test/erlydtl_test_defs.erl

@@ -1292,7 +1292,7 @@ all_test_defs() ->
         <<"{% trans 'Hans' as name %}Hello {{ name }}">>, [],
         <<"Hello Hans">>},
        {"trans value",
-        <<"{{ _('foo') }}">>, [], [], [{locale, none}, {blocktrans_fun, fun ("foo") -> "bar" end}],
+        <<"{{ _('foo') }}">>, [], [], [{locale, default}, {blocktrans_fun, fun ("foo") -> "bar" end}],
         <<"bar">>}
       ]},
      {"blocktrans",
@@ -1322,7 +1322,7 @@ all_test_defs() ->
      {"extended translation features (#131)",
       [{"trans default locale",
         <<"test {% trans 'message' %}">>,
-        [], [{translation_fun, fun ("message", none) -> "ok" end}],
+        [], [{translation_fun, fun ("message", default) -> "ok" end}],
         <<"test ok">>},
        {"trans foo locale",
         <<"test {% trans 'message' %}">>,
@@ -1330,7 +1330,7 @@ all_test_defs() ->
         <<"test ok">>},
        {"trans context (run-time)",
         <<"test {% trans 'message' context 'foo' %}">>,
-        [], [{translation_fun, fun ("message", {none, "foo"}) -> "ok" end}],
+        [], [{translation_fun, fun ("message", {default, "foo"}) -> "ok" end}],
         <<"test ok">>},
        {"trans context (compile-time)",
         <<"test {% trans 'message' context 'foo' %}">>,