From e6fc9c54b33c27c3b3e1429c9663938c414f0e10 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Jan 10 2014 16:04:37 +0000 Subject: Remove TEXTDOMAIN redefinition from tcar functions. - Previously, tcar functions redefine TEXTDOMAIN environment variable in order to use tcar.po file. This was required in order to reset the value set by modules, which were using their own po file. Now, both modules and tcar function use the same po file so there is no need to redefine TEXTDOMAIN environment variable inside tcar functions. So, this update removes TEXTDOMAIN redefinition from tcar functions. --- diff --git a/Scripts/tcar_checkFiles.sh b/Scripts/tcar_checkFiles.sh index b69c9ea..e93ae13 100755 --- a/Scripts/tcar_checkFiles.sh +++ b/Scripts/tcar_checkFiles.sh @@ -31,11 +31,6 @@ # finishes its execution. function tcar_checkFiles { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - # Initialize local array variables. local -a CONDITION_COMMAND local -a CONDITION_PATTERN diff --git a/Scripts/tcar_getTemporalFile.sh b/Scripts/tcar_getTemporalFile.sh index 557b46d..bf9c5e7 100755 --- a/Scripts/tcar_getTemporalFile.sh +++ b/Scripts/tcar_getTemporalFile.sh @@ -28,11 +28,6 @@ # temporal files inside tcar.sh script. function tcar_getTemporalFile { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - # Define base name for temporal file. This is required when svg # instances are created previous to be parsed by inkscape in order # to be exported as png. In such cases .svg file extension is diff --git a/Scripts/tcar_printCopyrightInfo.sh b/Scripts/tcar_printCopyrightInfo.sh index 54eb28e..02b7ed6 100755 --- a/Scripts/tcar_printCopyrightInfo.sh +++ b/Scripts/tcar_printCopyrightInfo.sh @@ -38,11 +38,6 @@ # for software distribution. function tcar_printCopyrightInfo { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - case "${1}" in --license ) diff --git a/Scripts/tcar_printMessage.sh b/Scripts/tcar_printMessage.sh index c60bb98..cb075b7 100755 --- a/Scripts/tcar_printMessage.sh +++ b/Scripts/tcar_printMessage.sh @@ -26,11 +26,6 @@ # Standardize the way messages are printed by tcar.sh script. function tcar_printMessage { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - local MESSAGE="${1}" local FORMAT="${2}" diff --git a/Scripts/tcar_printVersion.sh b/Scripts/tcar_printVersion.sh index db1896d..150610e 100755 --- a/Scripts/tcar_printVersion.sh +++ b/Scripts/tcar_printVersion.sh @@ -26,11 +26,6 @@ # Print tcar version and license information. function tcar_printVersion { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - tcar_printMessage "`eval_gettext "\\\$TCAR_SCRIPT_NAME version \\\$TCAR_SCRIPT_VERSION"`" --as-stdout-line tcar_printCopyrightInfo tcar_printMessage "`eval_gettext "\\\$TCAR_SCRIPT_NAME comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of \\\$TCAR_SCRIPT_NAME under the terms of the GNU General Public License. For more information about these matters, see the file named COPYING."`" --as-stdout-line | fold --width=66 --spaces diff --git a/Scripts/tcar_setModuleArguments.sh b/Scripts/tcar_setModuleArguments.sh index 02fffdb..dd88f61 100755 --- a/Scripts/tcar_setModuleArguments.sh +++ b/Scripts/tcar_setModuleArguments.sh @@ -43,11 +43,6 @@ # levels. function tcar_setModuleArguments { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - # Verify non-option arguments passed to command-line. If there # isn't any or dot is provided, redefine the TCAR_MODULE_ARGUMENT # variable to use the current location the tcar.sh script diff --git a/Scripts/tcar_setModuleEnvironmentScripts.sh b/Scripts/tcar_setModuleEnvironmentScripts.sh index 550755e..621effa 100755 --- a/Scripts/tcar_setModuleEnvironmentScripts.sh +++ b/Scripts/tcar_setModuleEnvironmentScripts.sh @@ -27,11 +27,6 @@ # script environment. function tcar_setModuleEnvironmentScripts { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - # Define the pattern used to retrieve function names from function # files. local FUNCTION_PATTERN="^function[[:space:]]+${TCAR_MODULE_NAME}(_[[:alnum:]]+)?[[:space:]]+{[[:space:]]*$" diff --git a/Scripts/tcar_unsetModuleEnvironment.sh b/Scripts/tcar_unsetModuleEnvironment.sh index 682944e..1549764 100755 --- a/Scripts/tcar_unsetModuleEnvironment.sh +++ b/Scripts/tcar_unsetModuleEnvironment.sh @@ -26,11 +26,6 @@ # Unset functions exported to tcar.sh script execution environment. function tcar_unsetModuleEnvironment { - # Reset text domain locally, in order to prevent this function - # from using the last text domain definition. By default all - # common functions do use the same MO file. - local TEXTDOMAIN="${TCAR_SCRIPT_NAME}" - # Verify suffix value used to retrieve function files. if [[ -z ${TCAR_MODULE_NAME} ]];then tcar_printMessage "`gettext "The export id was not provided."`" --as-error-line