Skip to content

Commit

Permalink
Merge pull request #384 from cofacts/attribution
Browse files Browse the repository at this point in the history
Update terms to match suggestion from Lucien
  • Loading branch information
MrOrz authored Jan 27, 2021
2 parents db869c3 + 5400900 commit c277592
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 19 deletions.
39 changes: 24 additions & 15 deletions i18n/zh_TW.po
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ msgid "someone"
msgstr "有人"

#: components/LandingPage/Stats.js:146
#. we hold ~
#. we hold ~
msgid "a gathering of editors."
msgstr "編輯小聚"

Expand Down Expand Up @@ -912,20 +912,6 @@ msgstr "聯繫"
msgid "The content above"
msgstr "以上內容"

#: lib/terms.js:42
msgid "CC BY-SA 4.0"
msgstr "創用 CC 姓名標示-相同方式分享 4.0"

#: lib/terms.js:65
#, javascript-format
msgid "${ subject } by ${ authorLink } is licensed under ${ licenseLink }"
msgstr "${ subject }由 ${ authorLink } 提供,以${ licenseLink } 釋出。"

#: lib/terms.js:46
#, javascript-format
msgid "${ subject } by ${ AUTHOR } is licensed under ${ LICENSE }."
msgstr "${ subject }由 ${ AUTHOR } 提供,以${ LICENSE } 釋出。"

#: components/AppLayout/LoginModal.js:92
msgid "Terms of Use"
msgstr "使用者條款"
Expand Down Expand Up @@ -1079,6 +1065,29 @@ msgid ""
"message is incorrect."
msgstr "請簡單說明不實之處,作為「資料來源」的導讀"

#: lib/terms.js:66
#, javascript-format
msgid ""
"${ subject } by ${ authorLink } is licensed under ${ licenseLink }, the "
"community name and the provenance link for each item shall be fully cited "
"for further reproduction or redistribution."
msgstr ""
"${ subject }由${ authorLink }提供,以 ${ licenseLink } "
"釋出,於後續重製或散布時,原社群顯名及每一則查證的出處連結皆必須被完整引用。"

#: lib/terms.js:42
msgid "CC BY-SA 4.0"
msgstr "CC BY-SA 4.0"

#: lib/terms.js:43
msgid "Creative Commons Attribution-ShareAlike 4.0"
msgstr "CC授權 姓名標示-相同方式分享 4.0"

#: lib/terms.js:47
#, javascript-format
msgid "${ subject } by ${ AUTHOR } is licensed under ${ SHORT_LICENSE }."
msgstr "${ subject }由 ${ AUTHOR } 提供,以${ SHORT_LICENSE } 釋出。"

#: pages/index.js:41
msgctxt "site title"
msgid "Cofacts"
Expand Down
9 changes: 5 additions & 4 deletions lib/terms.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ function CCIcons() {
}

export const AUTHOR = t`Cofacts message reporting chatbot and crowd-sourced fact-checking community`;
export const LICENSE = t`CC BY-SA 4.0`;
export const SHORT_LICENSE = t`CC BY-SA 4.0`;
export const LICENSE = t`Creative Commons Attribution-ShareAlike 4.0`;

export default function getTermsString(subject, jsx = false) {
if (!jsx) {
return t`${subject} by ${AUTHOR} is licensed under ${LICENSE}.`;
return t`${subject} by ${AUTHOR} is licensed under ${SHORT_LICENSE}.`;
}

const authorLink = (
Expand All @@ -57,12 +58,12 @@ export default function getTermsString(subject, jsx = false) {
);
const licenseLink = (
<a key="licenseLink" style={{ color: 'inherit' }} href={LICENSE_URL}>
{LICENSE}
{LICENSE} ({SHORT_LICENSE})
</a>
);
return (
<Fragment>
{jt`${subject} by ${authorLink} is licensed under ${licenseLink}`}
{jt`${subject} by ${authorLink} is licensed under ${licenseLink}, the community name and the provenance link for each item shall be fully cited for further reproduction or redistribution.`}
<CCIcons />
</Fragment>
);
Expand Down

0 comments on commit c277592

Please sign in to comment.