diff --git a/Scripts/Functions/Locale/locale.sh b/Scripts/Functions/Locale/locale.sh index 2e6a50e..fd2d788 100644 --- a/Scripts/Functions/Locale/locale.sh +++ b/Scripts/Functions/Locale/locale.sh @@ -53,7 +53,7 @@ function locale { # base directory up to the repository (e.g., it is not possible in # subversion to add a directory structure which parent directory # structure hasn't been added to the repository, previously.). - L10N_BASEDIR="$(cli_getRepoTLDir)/Locales" + L10N_BASEDIR="$(cli_getRepoTLDir)/L10n" # Interpret arguments and options passed through command-line. locale_getOptions @@ -86,7 +86,7 @@ function locale { # Define work directory. This is the place where locales # directories will be stored in. WORKDIR=$(echo ${ACTIONVAL} \ - | sed -r -e "s!trunk/(Identity|Scripts|Manuals)!trunk/Locales/\1!") + | sed -r -e "s!trunk/(Identity|Scripts|Manuals)!trunk/L10n/\1!") # Add current locale to work directory. This is the place # where parent directories specific translation messages diff --git a/Scripts/Functions/Render/render_doBaseActions.sh b/Scripts/Functions/Render/render_doBaseActions.sh index 1db2f50..4054980 100755 --- a/Scripts/Functions/Render/render_doBaseActions.sh +++ b/Scripts/Functions/Render/render_doBaseActions.sh @@ -139,7 +139,7 @@ function render_doBaseActions { # Define final location of translation file. TRANSLATION=$(dirname $FILE \ - | sed -r 's!trunk/(Manuals|Identity)!trunk/Locales/\1!')/$(cli_getCurrentLocale)/messages.po + | sed -r 's!trunk/(Manuals|Identity)!trunk/L10n/\1!')/$(cli_getCurrentLocale)/messages.po # Define final location of template file. TEMPLATE=${FILE} diff --git a/Scripts/Functions/cli_getLocales.sh b/Scripts/Functions/cli_getLocales.sh index e00fa30..ca0d605 100755 --- a/Scripts/Functions/cli_getLocales.sh +++ b/Scripts/Functions/cli_getLocales.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# cli_getLocales.sh -- This function outputs/verifies locale codes in +# cli_getL10n.sh -- This function outputs/verifies locale codes in # LL and LL_CC format. Combine both ISO639 and ISO3166 specification # in order to build the final locale list. This function defines which # translation locales are supported inside CentOS Artwork Repository. @@ -25,7 +25,7 @@ # $Id$ # ---------------------------------------------------------------------- -function cli_getLocales { +function cli_getL10n { # Print locales supported by centos-art.sh script. locale -a | egrep '^[a-z]{2,3}_[A-Z]{2}$' | sort | uniq diff --git a/Scripts/Functions/cli_getRepoParallelDirs.sh b/Scripts/Functions/cli_getRepoParallelDirs.sh index 368a049..c05a8cf 100755 --- a/Scripts/Functions/cli_getRepoParallelDirs.sh +++ b/Scripts/Functions/cli_getRepoParallelDirs.sh @@ -46,7 +46,7 @@ function cli_getRepoParallelDirs { # Define parallel directory base structures. PDIRS[0]=Manuals/$(cli_getCurrentLocale)/Texinfo/Repository/$(cli_getRepoTLDir ${BOND} --relative) PDIRS[1]=Scripts/Bash/Functions/Render/Config - PDIRS[2]=Locales + PDIRS[2]=L10n # Redefine bond string without its top level directory structure. BOND=$(echo $BOND | sed -r "s,^${TDIR}/(.+)$,\1,") diff --git a/Scripts/centos-art.sh b/Scripts/centos-art.sh index 103520f..a91caee 100755 --- a/Scripts/centos-art.sh +++ b/Scripts/centos-art.sh @@ -41,7 +41,7 @@ export CLI_TEMPDIR='/tmp' # Initizalize internazionalization through gettext. . gettext.sh export TEXTDOMAIN=${CLI_PROGRAM}.sh -export TEXTDOMAINDIR=${HOME}/artwork/trunk/Locales/Scripts +export TEXTDOMAINDIR=${HOME}/artwork/trunk/L10n/Scripts # Initialize common function scripts. FILES=$(ls ${CLI_BASEDIR}/Functions/{cli,cli_*}.sh)