diff --git a/_po4a-tools/po4a-create-all-targets.sh b/_po4a-tools/po4a-create-all-targets.sh index 9b30b51ee..07d5fd929 100755 --- a/_po4a-tools/po4a-create-all-targets.sh +++ b/_po4a-tools/po4a-create-all-targets.sh @@ -99,16 +99,17 @@ process_with_po4a () { THRESHOLD="$THRESH_VAL" fi - # Determine file format to be used + # Determine file format to be used and set options (configured as an array to allow adding an arbitrary number of them) + OPTION=() if [ $ext == yml ] ; then FILE_FORMAT=yaml - OPTION="skip_array" + OPTION=("skip_array") elif [[ $ext == html || "$filename" == *'-index' ]] ; then # '-index.md' has a markdown extension but is actually html and should be processed as such by po4a FILE_FORMAT=xml - OPTION="ontagerror=warn" + OPTION=("ontagerror=silent" "translated=" "attributes=src alt") elif [ $ext == md ] ; then FILE_FORMAT=text - OPTION="markdown" + OPTION=("markdown") fi # Run po4a-translate and create target files @@ -120,7 +121,7 @@ process_with_po4a () { --localized "$targ_doc" \ --localized-charset "UTF-8" \ --no-deprecation \ - --option "$OPTION" \ + "${OPTION[@]/#/--option=}" \ --keep "$THRESHOLD" # Display message if translated file is created diff --git a/_po4a-tools/po4a-update-templates.sh b/_po4a-tools/po4a-update-templates.sh index 234fefda7..77f5731a3 100755 --- a/_po4a-tools/po4a-update-templates.sh +++ b/_po4a-tools/po4a-update-templates.sh @@ -60,16 +60,17 @@ while IFS= read -r -d '' doc ; do echo creating "$po_file" fi - # Determine file format to be used + # Determine file format to be used and set options (configured as an array to allow adding an arbitrary number of them) + OPTION=() if [ $ext == yml ] ; then FILE_FORMAT=yaml - OPTION="skip_array" + OPTION=("skip_array") elif [[ $ext == html || "$filename" == *'-index' ]] ; then # '-index.md' has a markdown extension but is actually html and should be processed as such by po4a FILE_FORMAT=xml - OPTION="ontagerror=warn" + OPTION=("ontagerror=silent" "translated=" "attributes=src alt") elif [ $ext == md ] ; then FILE_FORMAT=text - OPTION="markdown" + OPTION=("markdown") fi # Update/create .po files @@ -80,7 +81,7 @@ while IFS= read -r -d '' doc ; do --msgmerge-opt --no-wrap \ --wrap-po newlines \ --no-deprecation \ - --option "$OPTION" \ + "${OPTION[@]/#/--option=}" \ --po "$po_file" ; then echo '' echo Error updating "$lang" PO file for: "$filename".$ext @@ -103,3 +104,4 @@ for lang in $(ls "$PO_DIR") ; do # Delete line in file header that pollutes commits sed -i '/^"POT-Creation-Date:/d' $PO_DIR/$lang/*.po done + diff --git a/wiki/en/misc/1-index.md b/wiki/en/misc/1-index.md index a70b23231..6fbeb6265 100644 --- a/wiki/en/misc/1-index.md +++ b/wiki/en/misc/1-index.md @@ -29,7 +29,7 @@ Jamulus lets you play, rehearse, or jam with your friends, your band, or anyone
- A screenshot of the main mixer window showing five people from different countries connected. + A screenshot of the main mixer window showing several people from different countries connected.
Jamulus is international