diff --git a/Makefile b/Makefile index bd44b0db..cc27803d 100644 --- a/Makefile +++ b/Makefile @@ -62,9 +62,9 @@ install-stripped: @echo "* *" @echo "**********************************" @echo "" - @$(MAKE) -C src install-stripped - @$(MAKE) -C rem2html install - @$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE) + @$(MAKE) -C src install-stripped DESTDIR=$(DESTDIR) + @$(MAKE) -C rem2html install DESTDIR=$(DESTDIR) + @$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE) DESTDIR=$(DESTDIR) test: test-basic test-tz diff --git a/include/lang/de.rem b/include/lang/de.rem index f75fb376..2d7190b3 100644 --- a/include/lang/de.rem +++ b/include/lang/de.rem @@ -77,7 +77,4 @@ TRANSLATE "Aphelion" "Aphel" TRANSLATE "Daylight Saving Time Starts" "Beginn Sommerzeit" TRANSLATE "Daylight Saving Time Ends" "Ende Sommerzeit" -TRANSLATE "Sunrise" "Sonnenaufgang" -TRANSLATE "Sunset" "Sonnenuntergang" - TRANSLATE "No reminders." "Keine Termine." diff --git a/include/lang/nl.rem b/include/lang/nl.rem index 671b084b..a74be4b9 100644 --- a/include/lang/nl.rem +++ b/include/lang/nl.rem @@ -65,9 +65,6 @@ FSET - subst_s(a, d, t) iif(day(d) == 1 || day(d) == 8, "e", day(d) < 20, "de", FSET - ordx(n) n + "e" -TRANSLATE "Sunrise" "Zonsopgang" -TRANSLATE "Sunset" "Zonsondergang" - TRANSLATE "No reminders." "Geen herinneringen." TRANSLATE "Daylight Saving Time Begins" "Daglicht-sparende tijd begint" diff --git a/include/sun.rem b/include/sun.rem index c6827c73..d297ab39 100644 --- a/include/sun.rem +++ b/include/sun.rem @@ -1,6 +1,11 @@ # Sunrise and sunset # SPDX-License-Identifier: GPL-2.0-only +# Localize if we can +IF access($SysInclude + "/translations/" + _("LANGID") + "/sun.rem", "r") >= 0 + SYSINCLUDE translations/[_("LANGID")]/sun.rem +ENDIF + IF !$CalMode && !$PsCal REM NOQUEUE AT [sunrise()] MSG %"%"%(Sunrise) %! %2. REM NOQUEUE AT [sunset()] MSG %"%"%(Sunset) %! %2. diff --git a/include/translations/README.txt b/include/translations/README.txt new file mode 100644 index 00000000..273ff287 --- /dev/null +++ b/include/translations/README.txt @@ -0,0 +1,17 @@ +The files here contain additional translations for various files +distributed with Remind. + +If you create a file in $SysInclude whose name is "myfile.rem", then +you can enable translation by putting this at the top of your +file: + +#=================================================================== +# Localize if we can +IF access($SysInclude + "/translations/" + _("LANGID") + "/myfile.rem", "r") >= 0 + SYSINCLUDE translations/[_("LANGID")]/myfile.rem +ENDIF +#=================================================================== + +Then you can localize your file by putting appropriate TRANSLATION directives +in the file $SysInclude/translations//myfile.rem where is the +two-character language code. diff --git a/include/translations/de/sun.rem b/include/translations/de/sun.rem new file mode 100644 index 00000000..71f3cff2 --- /dev/null +++ b/include/translations/de/sun.rem @@ -0,0 +1,2 @@ +TRANSLATE "Sunrise" "Sonnenaufgang" +TRANSLATE "Sunset" "Sonnenuntergang" diff --git a/include/translations/nl/sun.rem b/include/translations/nl/sun.rem new file mode 100644 index 00000000..dfd9f54c --- /dev/null +++ b/include/translations/nl/sun.rem @@ -0,0 +1,2 @@ +TRANSLATE "Sunrise" "Zonsopgang" +TRANSLATE "Sunset" "Zonsondergang"