Improve validation of configured language options

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index a7eea52d598cf5442ec45eda5b10a320e86a63e1..eaf513e77db689d93d7d220e351ee28540a2c703 100644 (file)
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -1449,7 +1449,7 @@ opt_type(hosts) ->
            [iolist_to_binary(H) || H <- L]
     end;
 opt_type(language) ->
-    fun iolist_to_binary/1;
+    fun xmpp_lang:check/1;
 opt_type(max_fsm_queue) ->
     fun (I) when is_integer(I), I > 0 -> I end;
 opt_type(default_db) ->

diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index 9ae35700e7d3e47fc30e647f6e59e1059309dee8..29474e5111f07753150ef03945ccd15ebdd01902 100644 (file)
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -988,7 +988,7 @@ mod_opt_type({default_room_options, presence_broadcast}) ->
              end, L)
     end;
 mod_opt_type({default_room_options, lang}) ->
-    fun iolist_to_binary/1.
+    fun xmpp_lang:check/1.
 
 mod_options(Host) ->
     [{access, all},