Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix multiple placeholder args inside gettextf #242

Merged
merged 3 commits into from
Feb 26, 2025
+28 −28
Merged

fix multiple placeholder args inside gettextf #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adb641f
fix multiple placeholder args inside gettextf
shun2wang Feb 24, 2025
a485d97
Merge branch 'master' into fix_i18n
shun2wang Feb 25, 2025
7de233d
typo
shun2wang Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions R/unidimensionalReliabilityBayesian.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ unidimensionalReliabilityBayesian <- function(jaspResults, dataset, options) {
if (options[["naAction"]] == "listwise" && nrow(datasetOld) > nrow(dataset)) { # this indicates listwise deletion
model[["use.cases"]] <- "complete.obs"
model[["pairwise"]] <- FALSE
model[["footnote"]] <- gettextf("%s Of the observations, %1.f complete cases were used. ",
model[["footnote"]] <- gettextf("%1$s Of the observations, %2$1.f complete cases were used. ",
model[["footnote"]], nrow(dataset))

} else if (anyNA(dataset)) { # when pairwise deletion
Expand Down Expand Up @@ -1250,7 +1250,7 @@ unidimensionalReliabilityBayesian <- function(jaspResults, dataset, options) {
footnote <- ""
}
probabilityTable <- createJaspTable(
gettextf("Probability that Reliability Coefficient is Larger than %.2f and Smaller than %.2f", low, high))
gettextf("Probability that Reliability Coefficient is Larger than %1$.2f and Smaller than %2$.2f", low, high))
probabilityTable$dependOn(options = c("probabilityTableLowerBound", "probabilityTable", "probabilityTableUpperBound"))

overTitle <- gettext("Probability")
Expand Down
2 changes: 1 addition & 1 deletion R/unidimensionalReliabilityFrequentist.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ unidimensionalReliabilityFrequentist <- function(jaspResults, dataset, options)
if (options[["naAction"]] == "listwise" && nrow(datasetOld) > nrow(dataset)) { # this indicates listwise deletion
model[["use.cases"]] <- "complete.obs"
model[["pairwise"]] <- FALSE
model[["footnote"]] <- gettextf("%s Of the observations, %1.f complete cases were used. ",
model[["footnote"]] <- gettextf("%1$s Of the observations, %2$1.f complete cases were used. ",
model[["footnote"]], nrow(dataset))

} else if (anyNA(dataset)) { # when pairwise deletion
Expand Down
4 changes: 2 additions & 2 deletions po/R-de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ msgstr ""
msgid "SD"
msgstr "SD"

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "%s der Beobachtungen, es wurden %1.f vollständige Fälle verwendet."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "%1$s der Beobachtungen, es wurden %2$1.f vollständige Fälle verwendet."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/R-es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ msgstr "Varianza"
msgid "SD"
msgstr "DT"

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "%s de las observaciones, se utilizaron %1.f casos completos."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "%1$s de las observaciones, se utilizaron %2$1.f casos completos."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "%s de las observaciones, se utilizaron casos completos por pares."
Expand Down
4 changes: 2 additions & 2 deletions po/R-gl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ msgstr "Varianza"
msgid "SD"
msgstr "DP"

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "%s das observacións, utilizáronse %1.f casos completos."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "%1$s das observacións, utilizáronse %2$1.f casos completos."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "%s das observacións, utilizáronse casos completos por parellas."
Expand Down
4 changes: 2 additions & 2 deletions po/R-ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ msgstr ""
msgid "SD"
msgstr ""

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "観測値%s のうち、%1.f完全なケースが使用されました."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "観測値%1$s のうち、%2$1.f完全なケースが使用されました."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "観測値%s のうち、ペアワイズ処理された完全なケースが使用されました."
Expand Down
4 changes: 2 additions & 2 deletions po/R-jaspReliability.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ msgstr ""
msgid "SD"
msgstr ""

msgid "%s Of the observations, %1.f complete cases were used."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr ""

msgid "%s Of the observations, pairwise complete cases were used."
Expand Down Expand Up @@ -215,7 +215,7 @@ msgstr ""
msgid "The bounds you entered have been rearranged in increasing order to provide meaningful results."
msgstr ""

msgid "Probability that Reliability Coefficient is Larger than %.2f and Smaller than %.2f"
msgid "Probability that Reliability Coefficient is Larger than %1$.2f and Smaller than %2$.2f"
msgstr ""

msgid "Probability"
Expand Down
4 changes: 2 additions & 2 deletions po/R-nl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ msgstr "Variantie"
msgid "SD"
msgstr "SD"

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "%s van de observaties, zijn %1.f volledige observaties gebruikt."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "%1$s van de observaties, zijn %2$1.f volledige observaties gebruikt."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/R-pl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ msgstr ""
msgid "SD"
msgstr ""

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "%s Ze wszystkich obserwacji, użyto %1.f kompletnych przypadków."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "%1$s Ze wszystkich obserwacji, użyto %2$1.f kompletnych przypadków."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "%s ze wszystkich obserwacji, użyto kompletnych przypadków."
Expand Down
4 changes: 2 additions & 2 deletions po/R-pt.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ msgstr ""
msgid "SD"
msgstr ""

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "Dos %s de observações, foram utilizado %1.f dos casos completos."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "Dos %1$s de observações, foram utilizado %2$1.f dos casos completos."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "Dos %s de observações, foram utilizados casos completos por pares."
Expand Down
2 changes: 1 addition & 1 deletion po/R-ru.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ msgstr ""
msgid "SD"
msgstr ""

msgid "%s Of the observations, %1.f complete cases were used."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr ""

msgid "%s Of the observations, pairwise complete cases were used."
Expand Down
4 changes: 2 additions & 2 deletions po/R-ta.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ msgstr "மாறுபாட்டெண்"
msgid "SD"
msgstr "எச்.டி."

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "அவதானிப்புகளின் %s, %1.f எஃப் முழுமையான வழக்குகள் பயன்படுத்தப்பட்டன."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "அவதானிப்புகளின் %1$s, %2$1.f எஃப் முழுமையான வழக்குகள் பயன்படுத்தப்பட்டன."

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "அவதானிப்புகளின் %s, சோடிவரிசை முழுமையான வழக்குகள் பயன்படுத்தப்பட்டன."
Expand Down
2 changes: 1 addition & 1 deletion po/R-zh_Hans.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ msgstr ""
msgid "SD"
msgstr ""

msgid "%s Of the observations, %1.f complete cases were used."
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr ""

msgid "%s Of the observations, pairwise complete cases were used."
Expand Down
10 changes: 5 additions & 5 deletions po/R-zh_Hant.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ msgstr "變異數"
msgid "SD"
msgstr "標準差"

msgid "%s Of the observations, %1.f complete cases were used."
msgstr "從 %s 的觀察值中, 使用 %1.f 的完整資料"
msgid "%1$s Of the observations, %2$1.f complete cases were used."
msgstr "從 %1$s 的觀察值中, 使用 %2$1.f 的完整資料"

msgid "%s Of the observations, pairwise complete cases were used."
msgstr "從 %s 的觀察值中，以配對完整的個案進行分析"
Expand Down Expand Up @@ -251,9 +251,9 @@ msgid ""
msgstr "為提供有意義的結果，輸入界限已被調整"

msgid ""
"Probability that Reliability Coefficient is Larger than %.2f and Smaller "
"than %.2f"
msgstr "信度統計量大於 %.2f 且小於 %.2f 之機率"
"Probability that Reliability Coefficient is Larger than %1$.2f and Smaller "
"than %2$.2f"
msgstr "信度統計量大於 %1$.2f 且小於 %2$.2f 之機率"

msgid "Probability"
msgstr "機率"
Expand Down
Loading