Replace translate:mark/1 with ?T() macro

4 files changed, 75 insertions, 76 deletions

diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 869f9348b..88621fc0e 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -42,6 +42,7 @@
 -include("logger.hrl").
 -include("eldap.hrl").
 -include("xmpp.hrl").
+-include("translate.hrl").
 
 -define(PROCNAME, ejabberd_mod_vcard_ldap).
 
@@ -324,31 +325,31 @@ default_vcard_map() ->
      {<<"PHOTO">>, <<"%s">>, [<<"jpegPhoto">>]}].
 
 default_search_fields() ->
-    [{translate:mark(<<"User">>), <<"%u">>},
-     {translate:mark(<<"Full Name">>), <<"displayName">>},
-     {translate:mark(<<"Given Name">>), <<"givenName">>},
-     {translate:mark(<<"Middle Name">>), <<"initials">>},
-     {translate:mark(<<"Family Name">>), <<"sn">>},
-     {translate:mark(<<"Nickname">>), <<"%u">>},
-     {translate:mark(<<"Birthday">>), <<"birthDay">>},
-     {translate:mark(<<"Country">>), <<"c">>},
-     {translate:mark(<<"City">>), <<"l">>},
-     {translate:mark(<<"Email">>), <<"mail">>},
-     {translate:mark(<<"Organization Name">>), <<"o">>},
-     {translate:mark(<<"Organization Unit">>), <<"ou">>}].
+    [{?T("User"), <<"%u">>},
+     {?T("Full Name"), <<"displayName">>},
+     {?T("Given Name"), <<"givenName">>},
+     {?T("Middle Name"), <<"initials">>},
+     {?T("Family Name"), <<"sn">>},
+     {?T("Nickname"), <<"%u">>},
+     {?T("Birthday"), <<"birthDay">>},
+     {?T("Country"), <<"c">>},
+     {?T("City"), <<"l">>},
+     {?T("Email"), <<"mail">>},
+     {?T("Organization Name"), <<"o">>},
+     {?T("Organization Unit"), <<"ou">>}].
 
 default_search_reported() ->
-    [{translate:mark(<<"Full Name">>), <<"FN">>},
-     {translate:mark(<<"Given Name">>), <<"FIRST">>},
-     {translate:mark(<<"Middle Name">>), <<"MIDDLE">>},
-     {translate:mark(<<"Family Name">>), <<"LAST">>},
-     {translate:mark(<<"Nickname">>), <<"NICK">>},
-     {translate:mark(<<"Birthday">>), <<"BDAY">>},
-     {translate:mark(<<"Country">>), <<"CTRY">>},
-     {translate:mark(<<"City">>), <<"LOCALITY">>},
-     {translate:mark(<<"Email">>), <<"EMAIL">>},
-     {translate:mark(<<"Organization Name">>), <<"ORGNAME">>},
-     {translate:mark(<<"Organization Unit">>), <<"ORGUNIT">>}].
+    [{?T("Full Name"), <<"FN">>},
+     {?T("Given Name"), <<"FIRST">>},
+     {?T("Middle Name"), <<"MIDDLE">>},
+     {?T("Family Name"), <<"LAST">>},
+     {?T("Nickname"), <<"NICK">>},
+     {?T("Birthday"), <<"BDAY">>},
+     {?T("Country"), <<"CTRY">>},
+     {?T("City"), <<"LOCALITY">>},
+     {?T("Email"), <<"EMAIL">>},
+     {?T("Organization Name"), <<"ORGNAME">>},
+     {?T("Organization Unit"), <<"ORGUNIT">>}].
 
 parse_options(Host, Opts) ->
     MyHosts = gen_mod:get_opt_hosts(Host, Opts, <<"vjud.@HOST@">>),
diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl
index 08dd4f940..3e742ec15 100644
--- a/src/mod_vcard_mnesia.erl
+++ b/src/mod_vcard_mnesia.erl
@@ -36,6 +36,7 @@
 -include("xmpp.hrl").
 -include("mod_vcard.hrl").
 -include("logger.hrl").
+-include("translate.hrl").
 
 %%%===================================================================
 %%% API
@@ -95,32 +96,32 @@ search(LServer, Data, AllowReturnAll, MaxMatch) ->
     end.
 
 search_fields(_LServer) ->
-    [{translate:mark(<<"User">>), <<"user">>},
-     {translate:mark(<<"Full Name">>), <<"fn">>},
-     {translate:mark(<<"Name">>), <<"first">>},
-     {translate:mark(<<"Middle Name">>), <<"middle">>},
-     {translate:mark(<<"Family Name">>), <<"last">>},
-     {translate:mark(<<"Nickname">>), <<"nick">>},
-     {translate:mark(<<"Birthday">>), <<"bday">>},
-     {translate:mark(<<"Country">>), <<"ctry">>},
-     {translate:mark(<<"City">>), <<"locality">>},
-     {translate:mark(<<"Email">>), <<"email">>},
-     {translate:mark(<<"Organization Name">>), <<"orgname">>},
-     {translate:mark(<<"Organization Unit">>), <<"orgunit">>}].
+    [{?T("User"), <<"user">>},
+     {?T("Full Name"), <<"fn">>},
+     {?T("Name"), <<"first">>},
+     {?T("Middle Name"), <<"middle">>},
+     {?T("Family Name"), <<"last">>},
+     {?T("Nickname"), <<"nick">>},
+     {?T("Birthday"), <<"bday">>},
+     {?T("Country"), <<"ctry">>},
+     {?T("City"), <<"locality">>},
+     {?T("Email"), <<"email">>},
+     {?T("Organization Name"), <<"orgname">>},
+     {?T("Organization Unit"), <<"orgunit">>}].
 
 search_reported(_LServer) ->
-    [{translate:mark(<<"Jabber ID">>), <<"jid">>},
-     {translate:mark(<<"Full Name">>), <<"fn">>},
-     {translate:mark(<<"Name">>), <<"first">>},
-     {translate:mark(<<"Middle Name">>), <<"middle">>},
-     {translate:mark(<<"Family Name">>), <<"last">>},
-     {translate:mark(<<"Nickname">>), <<"nick">>},
-     {translate:mark(<<"Birthday">>), <<"bday">>},
-     {translate:mark(<<"Country">>), <<"ctry">>},
-     {translate:mark(<<"City">>), <<"locality">>},
-     {translate:mark(<<"Email">>), <<"email">>},
-     {translate:mark(<<"Organization Name">>), <<"orgname">>},
-     {translate:mark(<<"Organization Unit">>), <<"orgunit">>}].
+    [{?T("Jabber ID"), <<"jid">>},
+     {?T("Full Name"), <<"fn">>},
+     {?T("Name"), <<"first">>},
+     {?T("Middle Name"), <<"middle">>},
+     {?T("Family Name"), <<"last">>},
+     {?T("Nickname"), <<"nick">>},
+     {?T("Birthday"), <<"bday">>},
+     {?T("Country"), <<"ctry">>},
+     {?T("City"), <<"locality">>},
+     {?T("Email"), <<"email">>},
+     {?T("Organization Name"), <<"orgname">>},
+     {?T("Organization Unit"), <<"orgunit">>}].
 
 remove_user(LUser, LServer) ->
     US = {LUser, LServer},
diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl
index 28a6f2ce5..6092c3500 100644
--- a/src/mod_vcard_sql.erl
+++ b/src/mod_vcard_sql.erl
@@ -37,6 +37,7 @@
 -include("mod_vcard.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
+-include("translate.hrl").
 
 %%%===================================================================
 %%% API
@@ -150,32 +151,32 @@ search(LServer, Data, AllowReturnAll, MaxMatch) ->
     end.
 
 search_fields(_LServer) ->
-    [{translate:mark(<<"User">>), <<"user">>},
-     {translate:mark(<<"Full Name">>), <<"fn">>},
-     {translate:mark(<<"Name">>), <<"first">>},
-     {translate:mark(<<"Middle Name">>), <<"middle">>},
-     {translate:mark(<<"Family Name">>), <<"last">>},
-     {translate:mark(<<"Nickname">>), <<"nick">>},
-     {translate:mark(<<"Birthday">>), <<"bday">>},
-     {translate:mark(<<"Country">>), <<"ctry">>},
-     {translate:mark(<<"City">>), <<"locality">>},
-     {translate:mark(<<"Email">>), <<"email">>},
-     {translate:mark(<<"Organization Name">>), <<"orgname">>},
-     {translate:mark(<<"Organization Unit">>), <<"orgunit">>}].
+    [{?T("User"), <<"user">>},
+     {?T("Full Name"), <<"fn">>},
+     {?T("Name"), <<"first">>},
+     {?T("Middle Name"), <<"middle">>},
+     {?T("Family Name"), <<"last">>},
+     {?T("Nickname"), <<"nick">>},
+     {?T("Birthday"), <<"bday">>},
+     {?T("Country"), <<"ctry">>},
+     {?T("City"), <<"locality">>},
+     {?T("Email"), <<"email">>},
+     {?T("Organization Name"), <<"orgname">>},
+     {?T("Organization Unit"), <<"orgunit">>}].
 
 search_reported(_LServer) ->
-    [{translate:mark(<<"Jabber ID">>), <<"jid">>},
-     {translate:mark(<<"Full Name">>), <<"fn">>},
-     {translate:mark(<<"Name">>), <<"first">>},
-     {translate:mark(<<"Middle Name">>), <<"middle">>},
-     {translate:mark(<<"Family Name">>), <<"last">>},
-     {translate:mark(<<"Nickname">>), <<"nick">>},
-     {translate:mark(<<"Birthday">>), <<"bday">>},
-     {translate:mark(<<"Country">>), <<"ctry">>},
-     {translate:mark(<<"City">>), <<"locality">>},
-     {translate:mark(<<"Email">>), <<"email">>},
-     {translate:mark(<<"Organization Name">>), <<"orgname">>},
-     {translate:mark(<<"Organization Unit">>), <<"orgunit">>}].
+    [{?T("Jabber ID"), <<"jid">>},
+     {?T("Full Name"), <<"fn">>},
+     {?T("Name"), <<"first">>},
+     {?T("Middle Name"), <<"middle">>},
+     {?T("Family Name"), <<"last">>},
+     {?T("Nickname"), <<"nick">>},
+     {?T("Birthday"), <<"bday">>},
+     {?T("Country"), <<"ctry">>},
+     {?T("City"), <<"locality">>},
+     {?T("Email"), <<"email">>},
+     {?T("Organization Name"), <<"orgname">>},
+     {?T("Organization Unit"), <<"orgunit">>}].
 
 remove_user(LUser, LServer) ->
     ejabberd_sql:sql_transaction(
diff --git a/src/translate.erl b/src/translate.erl
index aaadcd967..240a423d6 100644
--- a/src/translate.erl
+++ b/src/translate.erl
@@ -29,7 +29,7 @@
 
 -behaviour(gen_server).
 
--export([start_link/0, reload/0, translate/2, mark/1]).
+-export([start_link/0, reload/0, translate/2]).
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
@@ -219,10 +219,6 @@ translate(Msg) ->
 	  end
     end.
 
--spec mark(binary()) -> binary().
-mark(Msg) ->
-    Msg.
-
 ascii_tolower(B) ->
     iolist_to_binary(ascii_tolower_s(binary_to_list(B))).