submodule: take advantage of gettextln and eval_gettextln.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index bc1d3fa663a5eb39dd96f6ad2ca17437073ceb0a..986c5d6a74730477f51de6e704ba896ee7fee677 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -223,12 +223,9 @@ cmd_add()
 
        if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
        then
 
        if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
        then

-               (
-                       eval_gettext "The following path is ignored by one of your .gitignore files:
+               eval_gettextln "The following path is ignored by one of your .gitignore files:

 \$path
 \$path

-Use -f if you really want to add it." &&
-                       echo
-               ) >&2
+Use -f if you really want to add it." >&2

                exit 1
        fi
 
                exit 1
        fi
 


@@ -237,7 +234,7 @@ Use -f if you really want to add it." &&
        then
                if test -d "$path"/.git -o -f "$path"/.git
                then
        then
                if test -d "$path"/.git -o -f "$path"/.git
                then

-                       eval_gettext "Adding existing repo at '\$path' to the index"; echo
+                       eval_gettextln "Adding existing repo at '\$path' to the index"

                else
                        die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
                fi
                else
                        die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
                fi


@@ -696,10 +693,7 @@ cmd_summary() {
                                ;; # removed
                        *)
                                # unexpected type
                                ;; # removed
                        *)
                                # unexpected type

-                               (
-                                       eval_gettext "unexpected mode \$mod_dst" &&
-                                       echo
-                               ) >&2
+                               eval_gettextln "unexpected mode \$mod_dst" >&2

                                continue ;;
                        esac
                fi
                                continue ;;
                        esac
                fi


@@ -786,9 +780,9 @@ cmd_summary() {
        done |
        if test -n "$for_status"; then
                if [ -n "$files" ]; then
        done |
        if test -n "$for_status"; then
                if [ -n "$files" ]; then

-                       gettext "# Submodules changed but not updated:"; echo
+                       gettextln "# Submodules changed but not updated:"

                else
                else

-                       gettext "# Submodule changes to be committed:"; echo
+                       gettextln "# Submodule changes to be committed:"

                fi
                echo "#"
                sed -e 's|^|# |' -e 's|^# $|#|'
                fi
                echo "#"
                sed -e 's|^|# |' -e 's|^# $|#|'