Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-01 19:41:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix a malformatted gettext string, and update the localization README (#758)

Browse Source 
* Fix a gettext marked string that has one too many parantheses around it, excluding it from translations. Also, clean up layout around it.

* Add Swedish translation for the above.

* More explicit localization steps in the README to avoid recurring mistakes.
This commit is contained in:
Daniel Markstedt 2022-05-02 12:42:09 -07:00 committed by GitHub
parent aa1f3b02e3
commit a1a2e6089b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 91 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
python/web/README.md
View File

@ -42,7 +42,8 @@ $ git push pi master
We use the Flask-Babel library and Flask/Jinja2 extension for i18n. We use the Flask-Babel library and Flask/Jinja2 extension for i18n.
It uses the 'pybabel' command line tool for extracting and compiling localizations. It uses the 'pybabel' command line tool for extracting and compiling localizations. The Web Interface start script will automatically compile localizations upon launch.
Activate the Python venv in src/web/ to use it: Activate the Python venv in src/web/ to use it:
``` ```
$ cd python/web $ cd python/web
@ -54,10 +55,31 @@ To create a new localization, it needs to be added to the LANGAUGES constant in
web/settings.py. To localize messages coming from the RaSCSI backend, update also code in web/settings.py. To localize messages coming from the RaSCSI backend, update also code in
raspberrypi/localizer.cpp in the RaSCSI C++ code. raspberrypi/localizer.cpp in the RaSCSI C++ code.
Once this is done, follow the steps in the [Flask-Babel documentation](https://flask-babel.tkte.ch/#translating-applications) Once this is done, it is time to localize the Python code. The below steps are derived from the [Flask-Babel documentation](https://flask-babel.tkte.ch/#translating-applications).
to generate the messages.po for the new language.
Updating the strings in an existing messages.po is also covered above. First, generate the raw messages.pot file containing extracted strings.
```
$ pybabel extract -F babel.cfg -o messages.pot .
```
### Initialize a new localization
When adding a localization for a new language, initialize the directory structure. Replace 'xx' with the two character code for the language.
```
$ pybabel init -i messages.pot -d translations -l xx
```
### Update an existing loclization
After strings have been added or changed in the code, update the existing localizations.
```
pybabel update -i messages.pot -d src/translations
```
Then edit the updated messages.po file for your language. Make sure to update fuzzy strings and translate new ones.
When you are ready to contribute new or updated localizations, use the same Gitflow Workflow as used for any code contributions to submit PRs against the develop branch. When you are ready to contribute new or updated localizations, use the same Gitflow Workflow as used for any code contributions to submit PRs against the develop branch.

100
python/web/src/translations/sv/LC_MESSAGES/messages.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: RaSCSI 68kmla Edition\n" "Project-Id-Version: RaSCSI 68kmla Edition\n"
"Report-Msgid-Bugs-To: https://github.com/akuker/RASCSI/issues\n" "Report-Msgid-Bugs-To: https://github.com/akuker/RASCSI/issues\n"
"POT-Creation-Date: 2022-04-13 15:41-0700\n" "POT-Creation-Date: 2022-05-01 21:44-0700\n"
"PO-Revision-Date: 2021-12-24 16:16-0800\n" "PO-Revision-Date: 2021-12-24 16:16-0800\n"
"Last-Translator: Daniel Markstedt <markstedt@gmail.com>\n" "Last-Translator: Daniel Markstedt <markstedt@gmail.com>\n"
"Language: sv\n" "Language: sv\n"
@ -146,7 +146,7 @@ msgstr "Kunde ej läsa egenskaper från %(properties_file)s"
msgid "You must log in with credentials for a user in the '%(group)s' group" msgid "You must log in with credentials for a user in the '%(group)s' group"
msgstr "Du måste logga in som en användare som tillhör %(group)s-gruppen" msgstr "Du måste logga in som en användare som tillhör %(group)s-gruppen"
#: src/web.py:329 src/web.py:830 #: src/web.py:329 src/web.py:832
#, python-format #, python-format
msgid "Image file created: %(file_name)s" msgid "Image file created: %(file_name)s"
msgstr "Skapade skivbildsfil %(file_name)s" msgstr "Skapade skivbildsfil %(file_name)s"
@ -170,7 +170,16 @@ msgstr "Följ instruktionerna på %(url)s"
msgid "Attached %(device_type)s to SCSI ID %(id_number)s LUN %(unit_number)s" msgid "Attached %(device_type)s to SCSI ID %(id_number)s LUN %(unit_number)s"
msgstr "Anslöt %(device_type)s till SCSI-id %(id_number)s LUN %(unit_number)s" msgstr "Anslöt %(device_type)s till SCSI-id %(id_number)s LUN %(unit_number)s"
#: src/web.py:565 #: src/web.py:559
#, python-format
msgid ""
"Attached %(file_name)s as %(device_type)s to SCSI ID %(id_number)s LUN "
"%(unit_number)s"
msgstr ""
"Anslöt %(file_name)s som %(device_type)s till "
"SCSI-id %(id_number)s LUN %(unit_number)s"
#: src/web.py:564
#, python-format #, python-format
msgid "" msgid ""
"The image file size %(file_size)s bytes is not a multiple of " "The image file size %(file_size)s bytes is not a multiple of "
@ -181,7 +190,7 @@ msgstr ""
"RaSCSI ignorerar den överflödiga datan. Skivbilden är möjligen förstörd, " "RaSCSI ignorerar den överflödiga datan. Skivbilden är möjligen förstörd, "
"så var försiktig när du använder den." "så var försiktig när du använder den."
#: src/web.py:571 #: src/web.py:573
#, python-format #, python-format
msgid "" msgid ""
"Failed to attach %(file_name)s to SCSI ID %(id_number)s LUN " "Failed to attach %(file_name)s to SCSI ID %(id_number)s LUN "
@ -190,125 +199,125 @@ msgstr ""
"Kunde inte ansluta %(file_name)s till SCSI-id %(id_number)s LUN " "Kunde inte ansluta %(file_name)s till SCSI-id %(id_number)s LUN "
"%(unit_number)s" "%(unit_number)s"
#: src/web.py:585 #: src/web.py:587
msgid "Detached all SCSI devices" msgid "Detached all SCSI devices"
msgstr "Kopplade ifrån alla SCSI-enheter" msgstr "Kopplade ifrån alla SCSI-enheter"
#: src/web.py:602 #: src/web.py:604
#, python-format #, python-format
msgid "Detached SCSI ID %(id_number)s LUN %(unit_number)s" msgid "Detached SCSI ID %(id_number)s LUN %(unit_number)s"
msgstr "Kopplade ifrån SCSI-id %(id_number)s LUN %(unit_number)s" msgstr "Kopplade ifrån SCSI-id %(id_number)s LUN %(unit_number)s"
#: src/web.py:606 #: src/web.py:608
#, python-format #, python-format
msgid "Failed to detach SCSI ID %(id_number)s LUN %(unit_number)s" msgid "Failed to detach SCSI ID %(id_number)s LUN %(unit_number)s"
msgstr "Kunde ej koppla ifrån SCSI-id %(id_number)s LUN %(unit_number)s" msgstr "Kunde ej koppla ifrån SCSI-id %(id_number)s LUN %(unit_number)s"
#: src/web.py:623 #: src/web.py:625
#, python-format #, python-format
msgid "Ejected SCSI ID %(id_number)s LUN %(unit_number)s" msgid "Ejected SCSI ID %(id_number)s LUN %(unit_number)s"
msgstr "Utmatade SCSI-id %(id_number)s LUN %(unit_number)s" msgstr "Utmatade SCSI-id %(id_number)s LUN %(unit_number)s"
#: src/web.py:627 #: src/web.py:629
#, python-format #, python-format
msgid "Failed to eject SCSI ID %(id_number)s LUN %(unit_number)s" msgid "Failed to eject SCSI ID %(id_number)s LUN %(unit_number)s"
msgstr "Kunde ej mata ut skiva från SCSI-id %(id_number)s LUN %(unit_number)s" msgstr "Kunde ej mata ut skiva från SCSI-id %(id_number)s LUN %(unit_number)s"
#: src/web.py:650 #: src/web.py:652
msgid "DEVICE INFO" msgid "DEVICE INFO"
msgstr "ENHETSDETALJER" msgstr "ENHETSDETALJER"
#: src/web.py:652 #: src/web.py:654
#, python-format #, python-format
msgid "SCSI ID: %(id_number)s" msgid "SCSI ID: %(id_number)s"
msgstr "SCSI-id: %(id_number)s" msgstr "SCSI-id: %(id_number)s"
#: src/web.py:653 #: src/web.py:655
#, python-format #, python-format
msgid "LUN: %(unit_number)s" msgid "LUN: %(unit_number)s"
msgstr "LUN: %(unit_number)s" msgstr "LUN: %(unit_number)s"
#: src/web.py:654 #: src/web.py:656
#, python-format #, python-format
msgid "Type: %(device_type)s" msgid "Type: %(device_type)s"
msgstr "Typ: %(device_type)s" msgstr "Typ: %(device_type)s"
#: src/web.py:655 #: src/web.py:657
#, python-format #, python-format
msgid "Status: %(device_status)s" msgid "Status: %(device_status)s"
msgstr "Status: %(device_status)s" msgstr "Status: %(device_status)s"
#: src/web.py:656 #: src/web.py:658
#, python-format #, python-format
msgid "File: %(image_file)s" msgid "File: %(image_file)s"
msgstr "Fil: %(image_file)s" msgstr "Fil: %(image_file)s"
#: src/web.py:657 #: src/web.py:659
#, python-format #, python-format
msgid "Parameters: %(value)s" msgid "Parameters: %(value)s"
msgstr "Parametrar: %(value)s" msgstr "Parametrar: %(value)s"
#: src/web.py:658 #: src/web.py:660
#, python-format #, python-format
msgid "Vendor: %(value)s" msgid "Vendor: %(value)s"
msgstr "Tillverkare: %(value)s" msgstr "Tillverkare: %(value)s"
#: src/web.py:659 #: src/web.py:661
#, python-format #, python-format
msgid "Product: %(value)s" msgid "Product: %(value)s"
msgstr "Produkt: %(value)s" msgstr "Produkt: %(value)s"
#: src/web.py:660 #: src/web.py:662
#, python-format #, python-format
msgid "Revision: %(revision_number)s" msgid "Revision: %(revision_number)s"
msgstr "Revision: %(revision_number)s" msgstr "Revision: %(revision_number)s"
#: src/web.py:661 #: src/web.py:663
#, python-format #, python-format
msgid "Block Size: %(value)s bytes" msgid "Block Size: %(value)s bytes"
msgstr "Blockstorlek: %(value)s byte" msgstr "Blockstorlek: %(value)s byte"
#: src/web.py:662 #: src/web.py:664
#, python-format #, python-format
msgid "Image Size: %(value)s bytes" msgid "Image Size: %(value)s bytes"
msgstr "Skivbildsstorlek: %(value)s byte" msgstr "Skivbildsstorlek: %(value)s byte"
#: src/web.py:681 #: src/web.py:683
#, python-format #, python-format
msgid "Reserved SCSI ID %(id_number)s" msgid "Reserved SCSI ID %(id_number)s"
msgstr "Reserverat SCSI-id %(id_number)s" msgstr "Reserverat SCSI-id %(id_number)s"
#: src/web.py:684 #: src/web.py:686
#, python-format #, python-format
msgid "Failed to reserve SCSI ID %(id_number)s" msgid "Failed to reserve SCSI ID %(id_number)s"
msgstr "Kunde ej reservera SCSI-id %(id_number)s" msgstr "Kunde ej reservera SCSI-id %(id_number)s"
#: src/web.py:700 #: src/web.py:702
#, python-format #, python-format
msgid "Released the reservation for SCSI ID %(id_number)s" msgid "Released the reservation for SCSI ID %(id_number)s"
msgstr "Frigjorde SCSI-id %(id_number)s" msgstr "Frigjorde SCSI-id %(id_number)s"
#: src/web.py:703 #: src/web.py:705
#, python-format #, python-format
msgid "Failed to release the reservation for SCSI ID %(id_number)s" msgid "Failed to release the reservation for SCSI ID %(id_number)s"
msgstr "Kunde ej frigöra SCSI-id %(id_number)s" msgstr "Kunde ej frigöra SCSI-id %(id_number)s"
#: src/web.py:742 #: src/web.py:744
#, python-format #, python-format
msgid "Saved image as: %(file_name)s" msgid "Saved image as: %(file_name)s"
msgstr "Sparade bildfilen som %(file_name)s" msgstr "Sparade bildfilen som %(file_name)s"
#: src/web.py:744 #: src/web.py:746
#, python-format #, python-format
msgid "Failed to create CD-ROM image from %(url)s" msgid "Failed to create CD-ROM image from %(url)s"
msgstr "Kunde ej skapa CD-ROM-bildfil från %(url)s" msgstr "Kunde ej skapa CD-ROM-bildfil från %(url)s"
#: src/web.py:755 #: src/web.py:757
#, python-format #, python-format
msgid "Attached to SCSI ID %(id_number)s" msgid "Attached to SCSI ID %(id_number)s"
msgstr "Anslöt till SCSI-id %(id_number)s" msgstr "Anslöt till SCSI-id %(id_number)s"
#: src/web.py:758 #: src/web.py:760
#, python-format #, python-format
msgid "" msgid ""
"Failed to attach image to SCSI ID %(id_number)s. Try attaching it " "Failed to attach image to SCSI ID %(id_number)s. Try attaching it "
@ -317,40 +326,40 @@ msgstr ""
"Kunde ej ansluta bildfilen till SCSI-id %(id_number)s. Försök ansluta den" "Kunde ej ansluta bildfilen till SCSI-id %(id_number)s. Försök ansluta den"
" manuellt." " manuellt."
#: src/web.py:778 src/web.py:797 #: src/web.py:780 src/web.py:799
#, python-format #, python-format
msgid "Failed to download file from %(url)s" msgid "Failed to download file from %(url)s"
msgstr "Kunde ej ladda ner filen från %(url)s" msgstr "Kunde ej ladda ner filen från %(url)s"
#: src/web.py:857 #: src/web.py:859
#, python-format #, python-format
msgid "Image file deleted: %(file_name)s" msgid "Image file deleted: %(file_name)s"
msgstr "Filen %(file_name)s har blivit raderad" msgstr "Filen %(file_name)s har blivit raderad"
#: src/web.py:889 #: src/web.py:891
#, python-format #, python-format
msgid "Image file renamed to: %(file_name)s" msgid "Image file renamed to: %(file_name)s"
msgstr "Filen har blivit omdöpt till %(file_name)s" msgstr "Filen har blivit omdöpt till %(file_name)s"
#: src/web.py:926 #: src/web.py:928
msgid "Aborted unzip: File(s) with the same name already exists." msgid "Aborted unzip: File(s) with the same name already exists."
msgstr "Uppackning stoppad: En eller flera filer med samma namn existerar redan." msgstr "Uppackning stoppad: En eller flera filer med samma namn existerar redan."
#: src/web.py:928 #: src/web.py:930
msgid "Unzipped the following files:" msgid "Unzipped the following files:"
msgstr "Packade up dessa filer:" msgstr "Packade up dessa filer:"
#: src/web.py:932 #: src/web.py:934
#, python-format #, python-format
msgid "Properties file(s) have been moved to %(directory)s" msgid "Properties file(s) have been moved to %(directory)s"
msgstr "En eller flera egenskapsfiler har blivit flyttade till %(directory)s" msgstr "En eller flera egenskapsfiler har blivit flyttade till %(directory)s"
#: src/web.py:935 #: src/web.py:937
#, python-format #, python-format
msgid "Failed to unzip %(zip_file)s" msgid "Failed to unzip %(zip_file)s"
msgstr "Kunde ej packa up %(zip_file)s" msgstr "Kunde ej packa up %(zip_file)s"
#: src/web.py:953 #: src/web.py:955
#, python-format #, python-format
msgid "Changed Web Interface language to %(locale)s" msgid "Changed Web Interface language to %(locale)s"
msgstr "Bytte webbgränssnittets språk till %(locale)s" msgstr "Bytte webbgränssnittets språk till %(locale)s"
@ -729,8 +738,8 @@ msgid ""
"If RaSCSI was unable to detect the media type associated with the image, " "If RaSCSI was unable to detect the media type associated with the image, "
"you get to choose the type from the dropdown." "you get to choose the type from the dropdown."
msgstr "" msgstr ""
"Om RaSCSI inte känner igen filbildstypen kan du välja en " "Om RaSCSI inte känner igen filbildstypen kan du välja en enhetstyp från "
"enhetstyp från rullgardinsmenyn." "rullgardinsmenyn."
#: src/templates/index.html:166 #: src/templates/index.html:166
msgid "Size" msgid "Size"
@ -832,8 +841,8 @@ msgid ""
"compatible Atari systems, and require <a href=\"%(url)s\">driver " "compatible Atari systems, and require <a href=\"%(url)s\">driver "
"software</a> to be installed on the host system." "software</a> to be installed on the host system."
msgstr "" msgstr ""
"Skrivaren och värdtjänsterna kräver att <a href=\"%(url)s\">drivrutiner</a>" "Skrivaren och värdtjänsterna kräver att <a "
" installeras först." "href=\"%(url)s\">drivrutiner</a> installeras först."
#: src/templates/index.html:320 #: src/templates/index.html:320
msgid "Peripheral" msgid "Peripheral"
@ -854,8 +863,8 @@ msgid ""
"Install <a href=\"%(url)s\">Macproxy</a> to browse the Web with any " "Install <a href=\"%(url)s\">Macproxy</a> to browse the Web with any "
"vintage browser. It's not just for Macs!" "vintage browser. It's not just for Macs!"
msgstr "" msgstr ""
"Installera <a href=\"%(url)s\">Macproxy</a> för att surfa på nätet med gamla " "Installera <a href=\"%(url)s\">Macproxy</a> för att surfa på nätet med "
"webbläsare. Den är inte bara till för Macar!" "gamla webbläsare. Den är inte bara till för Macar!"
#: src/templates/index.html:372 #: src/templates/index.html:372
msgid "Upload File" msgid "Upload File"
@ -1030,8 +1039,8 @@ msgid ""
"Install <a href=\"%(url)s\">Netatalk</a> to use the AppleShare File " "Install <a href=\"%(url)s\">Netatalk</a> to use the AppleShare File "
"Server." "Server."
msgstr "" msgstr ""
"Installera <a href=\"%(url)s\">Netatalk</a> för att använda " "Installera <a href=\"%(url)s\">Netatalk</a> för att använda AppleShare-"
"AppleShare-fildelning." "fildelning."
#: src/templates/index.html:482 #: src/templates/index.html:482
msgid "Download File and Create CD-ROM image" msgid "Download File and Create CD-ROM image"
@ -1256,3 +1265,4 @@ msgstr "Stänger av Raspberry Pi..."
#: src/templates/index.html:706 #: src/templates/index.html:706
msgid "Shut Down Raspberry Pi" msgid "Shut Down Raspberry Pi"
msgstr "Stäng av Raspberry Pi" msgstr "Stäng av Raspberry Pi"

18
python/web/src/web.py
View File

@ -555,20 +555,22 @@ def attach_image():
process = ractl_cmd.attach_device(scsi_id, **kwargs) process = ractl_cmd.attach_device(scsi_id, **kwargs)
process = ReturnCodeMapper.add_msg(process) process = ReturnCodeMapper.add_msg(process)
if process["status"]: if process["status"]:
flash(_(( flash(_(
"Attached %(file_name)s as %(device_type)s to " "Attached %(file_name)s as %(device_type)s to "
"SCSI ID %(id_number)s LUN %(unit_number)s" "SCSI ID %(id_number)s LUN %(unit_number)s",
),
file_name=file_name, file_name=file_name,
device_type=get_device_name(device_type), device_type=get_device_name(device_type),
id_number=scsi_id, id_number=scsi_id,
unit_number=unit, unit_number=unit,
)) ))
if int(file_size) % int(expected_block_size): if int(file_size) % int(expected_block_size):
flash(_("The image file size %(file_size)s bytes is not a multiple of " flash(_(
u"%(block_size)s. RaSCSI will ignore the trailing data. " "The image file size %(file_size)s bytes is not a multiple of "
u"The image may be corrupted, so proceed with caution.", "%(block_size)s. RaSCSI will ignore the trailing data. "
file_size=file_size, block_size=expected_block_size), "error") "The image may be corrupted, so proceed with caution.",
file_size=file_size,
block_size=expected_block_size,
), "error")
return redirect(url_for("index")) return redirect(url_for("index"))
flash(_("Failed to attach %(file_name)s to SCSI ID %(id_number)s LUN %(unit_number)s", flash(_("Failed to attach %(file_name)s to SCSI ID %(id_number)s LUN %(unit_number)s",