From 916539338fab7c6084f6fee78ea4b20158feb8fd Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Mon, 9 Aug 2021 15:06:57 +0000
Subject: [PATCH] Support Unicode string formatting

Fixes https://github.com/erlware/erlware_commons/issues/157
---
 src/ec_cmd_log.erl | 14 +++++++-------
 src/ec_compile.erl |  2 +-
 src/ec_git_vsn.erl |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ec_cmd_log.erl b/src/ec_cmd_log.erl
index c601782..56efa5c 100644
--- a/src/ec_cmd_log.erl
+++ b/src/ec_cmd_log.erl
@@ -126,7 +126,7 @@ debug(LogState, Fun)
                                      colorize(LogState, ?CYAN, false, Fun())
                              end);
 debug(LogState, String) ->
-    debug(LogState, "~s~n", [String]).
+    debug(LogState, "~ts~n", [String]).
 
 %% @doc log at the debug level given the current log state with a format string
 %% and argements @see io:format/2
@@ -143,7 +143,7 @@ info(LogState, Fun)
                                     colorize(LogState, ?GREEN, false, Fun())
                             end);
 info(LogState, String) ->
-    info(LogState, "~s~n", [String]).
+    info(LogState, "~ts~n", [String]).
 
 %% @doc log at the info level given the current log state with a format string
 %% and argements @see io:format/2
@@ -160,7 +160,7 @@ error(LogState, Fun)
                                      colorize(LogState, ?RED, false, Fun())
                              end);
 error(LogState, String) ->
-    error(LogState, "~s~n", [String]).
+    error(LogState, "~ts~n", [String]).
 
 %% @doc log at the error level given the current log state with a format string
 %% and argements @see io:format/2
@@ -175,7 +175,7 @@ warn(LogState, Fun)
     when erlang:is_function(Fun) ->
     log(LogState, ?EC_WARN, fun() -> colorize(LogState, ?MAGENTA, false, Fun()) end);
 warn(LogState, String) ->
-    warn(LogState, "~s~n", [String]).
+    warn(LogState, "~ts~n", [String]).
 
 %% @doc log at the warn level given the current log state with a format string
 %% and argements @see io:format/2
@@ -187,7 +187,7 @@ warn(LogState, FormatString, Args) ->
 -spec log(t(), int_log_level(), log_fun()) -> ok.
 log(#state_t{log_level=DetailLogLevel}, LogLevel, Fun)
     when DetailLogLevel >= LogLevel ->
-    io:format("~s~n", [Fun()]);
+    io:format("~ts~n", [Fun()]);
 log(_, _, _) ->
     ok.
 
@@ -254,10 +254,10 @@ colorize(State, Color, true, Msg) when ?VALID_COLOR(Color) ->
     colorize(State, Color - 32, false, Msg);
 colorize(#state_t{caller=command_line, intensity = high},
          Color, false, Msg) when ?VALID_COLOR(Color) ->
-    lists:flatten(cf:format("~!" ++ [Color] ++"~s~s", [?PREFIX, Msg]));
+    lists:flatten(cf:format("~!" ++ [Color] ++"~ts~ts", [?PREFIX, Msg]));
 colorize(#state_t{caller=command_line, intensity = low},
          Color, false, Msg) when ?VALID_COLOR(Color) ->
-    lists:flatten(cf:format("~!" ++ [Color] ++"~s~!!~s", [?PREFIX, Msg]));
+    lists:flatten(cf:format("~!" ++ [Color] ++"~ts~!!~ts", [?PREFIX, Msg]));
 colorize(_LogState, _Color, _Bold, Msg) ->
     Msg.
 
diff --git a/src/ec_compile.erl b/src/ec_compile.erl
index 6c15520..7199610 100644
--- a/src/ec_compile.erl
+++ b/src/ec_compile.erl
@@ -38,7 +38,7 @@ beam_to_erl_source(BeamFName, ErlFName) ->
           Src =
               erl_prettypr:format(erl_syntax:form_list(tl(Forms))),
           {ok, Fd} = file:open(ErlFName, [write]),
-          io:fwrite(Fd, "~s~n", [Src]),
+          io:fwrite(Fd, "~ts~n", [Src]),
           file:close(Fd);
       Error ->
           Error
diff --git a/src/ec_git_vsn.erl b/src/ec_git_vsn.erl
index c932c58..8c2376f 100644
--- a/src/ec_git_vsn.erl
+++ b/src/ec_git_vsn.erl
@@ -75,7 +75,7 @@ build_vsn_string(Vsn, RawRef, RawCount) ->
 
 get_patch_count(RawRef) ->
     Ref = re:replace(RawRef, "\\s", "", [global]),
-    Cmd = io_lib:format("git rev-list --count ~s..HEAD",
+    Cmd = io_lib:format("git rev-list --count ~ts..HEAD",
                          [Ref]),
     case os:cmd(Cmd) of
         "fatal: " ++ _ ->
@@ -88,7 +88,7 @@ get_patch_count(RawRef) ->
 parse_tags({}) ->
     parse_tags("");
 parse_tags(Pattern) ->
-    Cmd = io_lib:format("git describe --abbrev=0 --tags --match \"~s*\"", [Pattern]),
+    Cmd = io_lib:format("git describe --abbrev=0 --tags --match \"~ts*\"", [Pattern]),
     Tag = os:cmd(Cmd),
     case Tag of
         "fatal: " ++ _ ->