1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00

Finish en.po and rename POT file.

Finish copying msgid to msgstr for `en.po`.
Rename POT file.
Rename MO files generated from PO files.

Signed-off-by: Emily Mabrey <emilymabrey93@gmail.com>
This commit is contained in:
Emily Mabrey 2021-07-22 03:27:09 -04:00
parent 3191d5f265
commit edca998293
5 changed files with 4376 additions and 3411 deletions

View File

@ -1,6 +1,6 @@
/********************************************************************** /**********************************************************************
Audacity: A Digital Audio Editor Tenacity: A Digital Audio Editor
Languages.cpp Languages.cpp
@ -64,11 +64,11 @@ static void FindFilesInPathList(const wxString & pattern,
static bool TranslationExists(const FilePaths &pathList, wxString code) static bool TranslationExists(const FilePaths &pathList, wxString code)
{ {
FilePaths results; FilePaths results;
FindFilesInPathList(code + L"/audacity.mo", pathList, results); FindFilesInPathList(code + L"/tenacity.mo", pathList, results);
#if defined(__WXMAC__) #if defined(__WXMAC__)
FindFilesInPathList(code + L".lproj/audacity.mo", pathList, results); FindFilesInPathList(code + L".lproj/tenacity.mo", pathList, results);
#endif #endif
FindFilesInPathList(code + L"/LC_MESSAGES/audacity.mo", pathList, results); FindFilesInPathList(code + L"/LC_MESSAGES/tenacity.mo", pathList, results);
return (results.size() > 0); return (results.size() > 0);
} }
@ -283,7 +283,7 @@ void GetLanguages( FilePaths pathList,
} }
} }
// JKC: Adding language for simplified audacity. // JKC: Adding language for simplified tenacity.
{ {
wxString code; wxString code;
code = wxT("en-simple"); code = wxT("en-simple");
@ -363,7 +363,7 @@ wxString SetLang( const FilePaths &pathList, const wxString & lang )
sLocale->AddCatalog(wxT("wxstd")); sLocale->AddCatalog(wxT("wxstd"));
// Must match TranslationExists() in Languages.cpp // Must match TranslationExists() in Languages.cpp
sLocale->AddCatalog("audacity"); sLocale->AddCatalog("tenacity");
// Initialize internationalisation (number formats etc.) // Initialize internationalisation (number formats etc.)
// //
@ -374,7 +374,7 @@ wxString SetLang( const FilePaths &pathList, const wxString & lang )
using future1 = decltype( using future1 = decltype(
// The file of unused strings is part of the source tree scanned by // The file of unused strings is part of the source tree scanned by
// xgettext when compiling the catalog template audacity.pot. // xgettext when compiling the catalog template tenacity.pot.
// Including it here doesn't change that but does make the C++ compiler // Including it here doesn't change that but does make the C++ compiler
// check for correct syntax, but also generate no object code for them. // check for correct syntax, but also generate no object code for them.
#include "FutureStrings.h" #include "FutureStrings.h"

View File

@ -48,7 +48,7 @@ foreach( source ${SOURCES} )
endif() endif()
set( po "${_SRCDIR}/${source}" ) set( po "${_SRCDIR}/${source}" )
set( mo "${dst}/audacity.mo" ) set( mo "${dst}/tenacity.mo" )
add_custom_command( add_custom_command(
DEPENDS DEPENDS

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# Run this script with locale as the current directory # Run this script with locale as the current directory
set -o errexit set -o errexit
echo ";; Recreating audacity.pot using .h, .cpp and .mm files" echo ";; Recreating tenacity.pot using .h, .cpp and .mm files"
for path in ../modules/mod-* ../libraries/lib-* ../include ../src ../crashreports ; do for path in ../modules/mod-* ../libraries/lib-* ../include ../src ; do
find $path -name \*.h -o -name \*.cpp -o -name \*.mm find $path -name \*.h -o -name \*.cpp -o -name \*.mm
done | LANG=c sort | \ done | LANG=c sort | \
sed -E 's/\.\.\///g' |\ sed -E 's/\.\.\///g' |\
@ -17,13 +17,13 @@ xargs xgettext \
--package-name="tenacity" \ --package-name="tenacity" \
--package-version='3.0.3' \ --package-version='3.0.3' \
--msgid-bugs-address="emabrey@tenacityaudio.org" \ --msgid-bugs-address="emabrey@tenacityaudio.org" \
--add-location=file -L C -o audacity.pot --add-location=file -L C -o tenacity.pot
echo ";; Adding nyquist files to audacity.pot" echo ";; Adding nyquist files to tenacity.pot"
for path in ../plug-ins ; do find $path -name \*.ny -not -name rms.ny; done | LANG=c sort | \ for path in ../plug-ins ; do find $path -name \*.ny -not -name rms.ny; done | LANG=c sort | \
sed -E 's/\.\.\///g' |\ sed -E 's/\.\.\///g' |\
xargs xgettext \ xargs xgettext \
--no-wrap \ --no-wrap \
--default-domain=audacity \ --default-domain=tenacity \
--directory=.. \ --directory=.. \
--keyword=_ --keyword=_C:1,2c --keyword=ngettext:1,2 --keyword=ngettextc:1,2,4c \ --keyword=_ --keyword=_C:1,2c --keyword=ngettext:1,2 --keyword=ngettextc:1,2,4c \
--add-comments=" i18n" \ --add-comments=" i18n" \
@ -32,7 +32,7 @@ xargs xgettext \
--package-name="tenacity" \ --package-name="tenacity" \
--package-version='3.0.4' \ --package-version='3.0.4' \
--msgid-bugs-address="emabrey@tenacityaudio.org" \ --msgid-bugs-address="emabrey@tenacityaudio.org" \
--add-location=file -L Lisp -j -o audacity.pot --add-location=file -L Lisp -j -o tenacity.pot
if test "${AUDACITY_ONLY_POT:-}" = 'y'; then if test "${AUDACITY_ONLY_POT:-}" = 'y'; then
return 0 return 0
fi fi
@ -42,8 +42,8 @@ for i in *.po; do
"Project-Id-Version: tenacity 3.0.4\\n"' $i > TEMP; mv TEMP $i "Project-Id-Version: tenacity 3.0.4\\n"' $i > TEMP; mv TEMP $i
done done
echo ";; Updating the .po files" echo ";; Updating the .po files"
sed 's/.*/echo "msgmerge --lang=& &.po audacity.pot -o &.po";\ sed 's/.*/echo "msgmerge --lang=& &.po tenacity.pot -o &.po";\
msgmerge --no-wrap --lang=& &.po audacity.pot -o &.po;/g' LINGUAS | bash msgmerge --no-wrap --lang=& &.po tenacity.pot -o &.po;/g' LINGUAS | bash
echo ";; Removing '#~|' (which confuse Windows version of msgcat)" echo ";; Removing '#~|' (which confuse Windows version of msgcat)"
for i in *.po; do for i in *.po; do
sed '/^#~|/d' $i > TEMP; mv TEMP $i sed '/^#~|/d' $i > TEMP; mv TEMP $i
@ -51,5 +51,5 @@ done
echo "" echo ""
echo ";;Translation updated" echo ";;Translation updated"
echo "" echo ""
head -n 11 audacity.pot | tail -n 3 head -n 11 tenacity.pot | tail -n 3
wc -l audacity.pot wc -l tenacity.pot