Skip to content

Commit

Permalink
Merge pull request #582 from ErinBecker/authors
Browse files Browse the repository at this point in the history
Make "the authors" translatable
  • Loading branch information
froggleston committed May 7, 2024
2 parents b8c9a94 + c5cbb5c commit 02a2dc4
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 17 deletions.
5 changes: 2 additions & 3 deletions R/utils-translate.R
Expand Up @@ -127,7 +127,7 @@ establish_translation_vars <- function() {
Cite = tr_('Cite'),
Contact = tr_('Contact'),
About = tr_('About'),
MaterialsLicensedUnder = tr_('Materials licensed under {license} by {authors}'),
MaterialsLicensedUnder = tr_('Materials licensed under {license} by the authors'),
TemplateLicense = tr_('Template licensed under <(CC-BY 4.0)> by {template_authors}'),
Carpentries = tr_('The Carpentries'),
BuiltWith = tr_('Built with {sandpaper_link}, {pegboard_link}, and {varnish_link}'),
Expand Down Expand Up @@ -377,7 +377,7 @@ replace_html <- function(txt, open, close) {
#' one = "a normal translated string (pretend it's translated from another language)",
#' two = "a question: are you (A) {a}, (B) {b}",
#' EstimatedTime = "Estimated time: {icons$clock} {minutes}",
#' license = "Licensed under {license} by {authors}",
#' license = "Licensed under {license} by the authors",
#' ThisLessonCoC = "This lesson operates under our <(Code of Conduct)>"
#' )
#' )
Expand All @@ -396,7 +396,6 @@ fill_translation_vars <- function(the_data) {
list(
icons = named_icons,
template_authors = '<a href="https://carpentries.org/">The Carpentries</a>',
authors = "the authors",
license = the_data$license %||% "CC-BY 4.0",
minutes = the_data$minutes %||% NULL,
updated = the_data$updated %||% NULL
Expand Down
Binary file modified inst/po/es/LC_MESSAGES/R-sandpaper.mo
Binary file not shown.
Binary file modified inst/po/ja/LC_MESSAGES/R-sandpaper.mo
Binary file not shown.
Binary file modified inst/po/uk/LC_MESSAGES/R-sandpaper.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion man/fill_translation_vars.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/known_languages.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions man/translations.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions po/R-es.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sandpaper 0.15.0.9000\n"
"POT-Creation-Date: 2024-04-11 13:14+0100\n"
"POT-Creation-Date: 2024-04-16 09:27-0700\n"
"PO-Revision-Date: 2023-12-06 11:03-0800\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -233,8 +233,8 @@ msgid "About"
msgstr "Acerca de"

#: utils-translate.R:130
msgid "Materials licensed under {license} by {authors}"
msgstr "Materiales bajo la {license} por {authors}"
msgid "Materials licensed under {license} by the authors"
msgstr "Materiales bajo la {license} por las autoras"

#: utils-translate.R:131
msgid "Template licensed under <(CC-BY 4.0)> by {template_authors}"
Expand Down
6 changes: 3 additions & 3 deletions po/R-ja.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sandpaper 0.14.1.9000\n"
"POT-Creation-Date: 2024-04-11 13:14+0100\n"
"POT-Creation-Date: 2024-04-20 19:32+0900\n"
"PO-Revision-Date: 2023-11-22 09:14+0900\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -232,8 +232,8 @@ msgid "About"
msgstr "概要"

#: utils-translate.R:130
msgid "Materials licensed under {license} by {authors}"
msgstr "材料は{authors}によって{license}のもとに掲載を許諾されている"
msgid "Materials licensed under {license} by the authors"
msgstr "材料は著者によって{license}のもとに掲載を許諾されている"

#: utils-translate.R:131
msgid "Template licensed under <(CC-BY 4.0)> by {template_authors}"
Expand Down
4 changes: 2 additions & 2 deletions po/R-sandpaper.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sandpaper 0.16.4\n"
"POT-Creation-Date: 2024-04-11 13:16+0100\n"
"POT-Creation-Date: 2024-04-20 19:32+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -223,7 +223,7 @@ msgid "About"
msgstr ""

#: utils-translate.R:130
msgid "Materials licensed under {license} by {authors}"
msgid "Materials licensed under {license} by the authors"
msgstr ""

#: utils-translate.R:131
Expand Down
6 changes: 4 additions & 2 deletions po/R-uk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sandpaper 0.16.1.9000\n"
"POT-Creation-Date: 2024-04-11 13:14+0100\n"
"POT-Creation-Date: 2024-04-16 09:27-0700\n"
"PO-Revision-Date: 2023-12-19 09:37-0800\n"
"Last-Translator: Olexandr Konovalov\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -233,7 +233,9 @@ msgid "About"
msgstr "Інформація"

#: utils-translate.R:130
msgid "Materials licensed under {license} by {authors}"
#, fuzzy
#| msgid "Materials licensed under {license} by {authors}"
msgid "Materials licensed under {license} by the authors"
msgstr "Матеріали ліцензовані за {license}. Автори: {authors}"

#: utils-translate.R:131
Expand Down

0 comments on commit 02a2dc4

Please sign in to comment.