From 394a536ae0726b7bb6a928af7c2980daa640123f Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Sun, 5 Jun 2022 10:15:26 +0200 Subject: [PATCH] Create distinctions between glitch-soc and Catstodon. Version suffix and string changes. --- CONTRIBUTING.md | 2 +- .../flavours/glitch/features/ui/components/link_footer.js | 3 ++- .../glitch/features/ui/components/onboarding_modal.js | 3 ++- app/javascript/flavours/glitch/locales/de.js | 3 ++- app/javascript/flavours/glitch/locales/en.js | 4 ++-- app/javascript/flavours/glitch/locales/es.js | 2 -- app/javascript/flavours/glitch/locales/ja.js | 2 -- app/javascript/flavours/glitch/locales/ko.js | 2 -- app/javascript/flavours/glitch/locales/pl.js | 2 -- app/javascript/flavours/glitch/locales/zh-CN.js | 4 +--- lib/mastodon/version.rb | 4 ++-- 11 files changed, 12 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c73438b46..6411c3d6fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Right now a lot of the planning for this project takes place... in my head. Actu ## Documentation ## Unlike glitch-soc, which has [`glitch-soc/docs`](https://github.com/glitch-soc/docs) (online at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/)), this repo only documents things in a README. Sorry. -Right now, we've mostly focused on the features that make this fork different from upstream, which, may I remind you, is already a fork, in some manner. +Right now, we've mostly focused on the features that make this fork different from upstream, which, may I remind you, is already a fork. ## Frontend Development ## diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js index d9579e9c9a..23ae2be82d 100644 --- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js +++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js @@ -59,9 +59,10 @@ class LinkFooter extends React.PureComponent {

{repository} (v{version}), + glitchsoc: glitch-soc, Mastodon: Mastodon }} />

diff --git a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js index e7be62ad89..81a58e0085 100644 --- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js @@ -144,10 +144,11 @@ const PageSix = ({ admin, domain }) => {

fork, + glitchsoc: Glitchsoc, Mastodon: Mastodon, github: GitHub, }} diff --git a/app/javascript/flavours/glitch/locales/de.js b/app/javascript/flavours/glitch/locales/de.js index ce64536235..d3fe3c90cf 100644 --- a/app/javascript/flavours/glitch/locales/de.js +++ b/app/javascript/flavours/glitch/locales/de.js @@ -1,7 +1,8 @@ import inherited from 'mastodon/locales/de.json'; const messages = { - // No translations available. + 'getting_started.open_source_notice': 'Catstodon ist quelloffene Software, zudem ein Fork von {glitchsoc}, was wiederum ein Fork von {Mastodon} ist. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.', + 'onboarding.page_six.github': '{domain} läuft auf Catstodon, was ein Fork ({fork}) von {glitchsoc} ist, welches wiederum ein Fork ({fork}) von {Mastodon} ist. It is fully compatible with all Mastodon apps and instances. Catstodon ist quelloffene Software. Du kannst auf GitHub unter {github} Probleme melden, nach neuen Funktionen fragen oder zum Code beitragen.', }; export default Object.assign({}, inherited, messages); diff --git a/app/javascript/flavours/glitch/locales/en.js b/app/javascript/flavours/glitch/locales/en.js index 90e924d4a6..4e0ccc52d1 100644 --- a/app/javascript/flavours/glitch/locales/en.js +++ b/app/javascript/flavours/glitch/locales/en.js @@ -1,7 +1,7 @@ import inherited from 'mastodon/locales/en.json'; const messages = { - 'getting_started.open_source_notice': 'Glitchsoc is free open source software forked from {Mastodon}. You can contribute or report issues on GitHub at {github}.', + 'getting_started.open_source_notice': 'Catstodon is open source software, a friendly fork of {glitchsoc}, which in turn is a fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.', 'layout.auto': 'Auto', 'layout.current_is': 'Your current layout is:', 'layout.desktop': 'Desktop', @@ -10,7 +10,7 @@ const messages = { 'getting_started.onboarding': 'Show me around', 'onboarding.page_one.federation': '{domain} is an \'instance\' of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.', 'onboarding.page_one.welcome': 'Welcome to {domain}!', - 'onboarding.page_six.github': '{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}, and is compatible with any Mastodon instance or app. Glitchsoc is entirely free and open-source. You can report bugs, request features, or contribute to the code on {github}.', + 'onboarding.page_six.github': '{domain} runs on Catstodon, which is a {fork} of {glitchsoc}, which, in turn, is a friendly {fork} of {Mastodon}. It is fully compatible with all Mastodon apps and instances. Catstodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.', 'settings.auto_collapse': 'Automatic collapsing', 'settings.auto_collapse_all': 'Everything', 'settings.auto_collapse_lengthy': 'Lengthy toots', diff --git a/app/javascript/flavours/glitch/locales/es.js b/app/javascript/flavours/glitch/locales/es.js index 0868738815..54d37679c3 100644 --- a/app/javascript/flavours/glitch/locales/es.js +++ b/app/javascript/flavours/glitch/locales/es.js @@ -13,7 +13,6 @@ const messages = { 'compose.attach': 'Adjuntar...', 'favourite_modal.combo': 'Puedes presionar {combo} para omitir esto la próxima vez', 'getting_started.onboarding': 'Paseo inicial', - 'getting_started.open_source_notice': 'Glitchsoc es software libre y gratuito bifurcado de {Mastodon}. Puedes contribuir o reportar errores en GitHub en {github}.', 'home.column_settings.show_direct': 'Mostrar mensajes directos', 'layout.auto': 'Automático', 'layout.current_is': 'Tu diseño actual es:', @@ -34,7 +33,6 @@ const messages = { 'notifications.marked_clear': 'Limpiar notificaciones seleccionadas', 'onboarding.page_one.federation': '{domain} es una "instancia" de Mastodon. Mastodon es una red de servidores independientes que se unen para crear una red social más grande. A estos servidores los llamamos instancias.', 'onboarding.page_one.welcome': '¡Bienvenidx a {domain}!', - 'onboarding.page_six.github': '{domain} usa Glitchsoc. Glitchsoc es una bifurcación {fork} amigable de {Mastodon}, y es compatible con cualquier instancia o aplicación de Mastodon. Glitchsoc es completamente gratuito y de código abierto. Puedes reportar errores, solicitar funciones o contribuir al código en {github}.', 'settings.always_show_spoilers_field': 'Siempre mostrar el campo de advertencia de contenido', 'settings.auto_collapse_all': 'Todo', 'settings.auto_collapse_lengthy': 'Toots largos', diff --git a/app/javascript/flavours/glitch/locales/ja.js b/app/javascript/flavours/glitch/locales/ja.js index 0ca5e5fc77..de67e182fc 100644 --- a/app/javascript/flavours/glitch/locales/ja.js +++ b/app/javascript/flavours/glitch/locales/ja.js @@ -1,7 +1,6 @@ import inherited from 'mastodon/locales/ja.json'; const messages = { - 'getting_started.open_source_notice': 'Glitchsocは{Mastodon}によるフリーなオープンソースソフトウェアです。誰でもGitHub（{github}）から開発に參加したり、問題を報告したりできます。', 'layout.auto': '自動', 'layout.current_is': 'あなたの現在のレイアウト:', 'layout.desktop': 'デスクトップ', @@ -11,7 +10,6 @@ const messages = { 'getting_started.onboarding': '解説を表示', 'onboarding.page_one.federation': '{domain}はMastodonのインスタンスです。Mastodonとは、独立したサーバが連携して作るソーシャルネットワークです。これらのサーバーをインスタンスと呼びます。', 'onboarding.page_one.welcome': '{domain}へようこそ！', - 'onboarding.page_six.github': '{domain}はGlitchsocを使用しています。Glitchsocは{Mastodon}のフレンドリーな{fork}で、どんなMastodonアプリやインスタンスとも互換性があります。Glitchsocは完全に無料で、オープンソースです。{github}でバグ報告や機能要望あるいは貢獻をすることが可能です。', 'settings.always_show_spoilers_field': '常にコンテンツワーニング設定を表示する(指定がない場合は通常投稿)', 'settings.auto_collapse': '自動折りたたみ', 'settings.auto_collapse_all': 'すべて', diff --git a/app/javascript/flavours/glitch/locales/ko.js b/app/javascript/flavours/glitch/locales/ko.js index a817044c1b..1c876483e3 100644 --- a/app/javascript/flavours/glitch/locales/ko.js +++ b/app/javascript/flavours/glitch/locales/ko.js @@ -52,7 +52,6 @@ const messages = { 'endorsed_accounts_editor.endorsed_accounts': '추천하는 계정들', 'favourite_modal.combo': '다음엔 {combo}를 눌러 건너뛸 수 있습니다', 'getting_started.onboarding': '둘러보기', - 'getting_started.open_source_notice': '글리치는 {Mastodon}의 자유 오픈소스 포크버전입니다. {github}에서 문제를 리포팅 하거나 기여를 할 수 있습니다.', 'home.column_settings.advanced': '고급', 'home.column_settings.filter_regex': '정규표현식으로 필터', 'home.column_settings.show_direct': 'DM 보여주기', @@ -93,7 +92,6 @@ const messages = { 'onboarding.page_six.almost_done': '거의 다 되었습니다…', 'onboarding.page_six.appetoot': '본 아페툿!', 'onboarding.page_six.apps_available': 'iOS, 안드로이드, 그리고 다른 플랫폼들을 위한 {apps}이 존재합니다.', - 'onboarding.page_six.github': '{domain}은 글리치를 통해 구동 됩니다. 글리치는 {Mastodon}의 {fork}입니다, 그리고 어떤 마스토돈 인스턴스나 앱과도 호환 됩니다. 글리치는 완전한 자유 오픈소스입니다. {github}에서 버그를 리포팅 하거나, 기능을 제안하거나, 코드를 기여할 수 있습니다.', 'onboarding.page_six.guidelines': '커뮤니티 가이드라인', 'onboarding.page_six.read_guidelines': '{domain}의 {guidelines}을 읽어주세요!', 'onboarding.page_six.various_app': '모바일 앱', diff --git a/app/javascript/flavours/glitch/locales/pl.js b/app/javascript/flavours/glitch/locales/pl.js index f430bf5770..3808997833 100644 --- a/app/javascript/flavours/glitch/locales/pl.js +++ b/app/javascript/flavours/glitch/locales/pl.js @@ -1,7 +1,6 @@ import inherited from 'mastodon/locales/pl.json'; const messages = { - 'getting_started.open_source_notice': 'Glitchsoc jest wolnym i otwartoźródłowym forkiem oprogramowania {Mastodon}. Możesz współtworzyć projekt lub zgłaszać błędy na GitHubie pod adresem {github}.', 'layout.auto': 'Automatyczny', 'layout.current_is': 'Twój obecny układ to:', 'layout.desktop': 'Desktopowy', @@ -11,7 +10,6 @@ const messages = { 'getting_started.onboarding': 'Rozejrzyj się', 'onboarding.page_one.federation': '{domain} jest \'instancją\' Mastodona. Mastodon to sieć działających niezależnie serwerów tworzących jedną sieć społecznościową. Te serwery nazywane są instancjami.', 'onboarding.page_one.welcome': 'Witamy na {domain}!', - 'onboarding.page_six.github': '{domain} jest oparty na Glitchsoc. Glitchsoc jest {forkiem} {Mastodon}a kompatybilnym z każdym klientem i aplikacją Mastodona. Glitchsoc jest całkowicie wolnym i otwartoźródłowym oprogramowaniem. Możesz zgłaszać błędy i sugestie funkcji oraz współtworzyć projekt na {github}.', 'settings.auto_collapse': 'Automatyczne zwijanie', 'settings.auto_collapse_all': 'Wszystko', 'settings.auto_collapse_lengthy': 'Długie wpisy', diff --git a/app/javascript/flavours/glitch/locales/zh-CN.js b/app/javascript/flavours/glitch/locales/zh-CN.js index 21a68fc01b..7b754ebcec 100644 --- a/app/javascript/flavours/glitch/locales/zh-CN.js +++ b/app/javascript/flavours/glitch/locales/zh-CN.js @@ -53,7 +53,6 @@ const messages = { 'endorsed_accounts_editor.endorsed_accounts': '推荐用户', 'favourite_modal.combo': '下次你可以按 {combo} 跳过这个', 'getting_started.onboarding': '参观一下', - 'getting_started.open_source_notice': 'Glitchsoc 是由 {Mastodon} 分叉出来的免费开源软件。你可以在 GitHub 上贡献或报告问题，地址是 {github}。', 'home.column_settings.advanced': '高级', 'home.column_settings.filter_regex': '按正则表达式过滤', 'home.column_settings.show_direct': '显示私信', @@ -94,7 +93,6 @@ const messages = { 'onboarding.page_six.almost_done': '就快完成了...', 'onboarding.page_six.appetoot': '尽情享用吧！', 'onboarding.page_six.apps_available': '有适用于 iOS、Android 和其他平台的应用程序。', - 'onboarding.page_six.github': '{domain} 在 Glitchsoc 上运行。Glitchsoc 是 {Mastodon} 的一个友好 {fork}，与任何 Mastodon 实例或应用兼容。Glitchsoc 是完全免费和开源的。你可以在 {github} 上报告错误、请求功能或贡献代码。', 'onboarding.page_six.guidelines': '社区准则', 'onboarding.page_six.read_guidelines': '请阅读 {domain} 的 {guidelines}！', 'onboarding.page_six.various_app': '应用程序', @@ -198,4 +196,4 @@ const messages = { 'web_app_crash.title': '抱歉，Mastodon 出了点问题。', }; -export default Object.assign({}, inherited, messages); \ No newline at end of file +export default Object.assign({}, inherited, messages); diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 2d0b283230..819858c74b 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def suffix - '+glitch' + '+catstodon' end def to_a @@ -33,7 +33,7 @@ module Mastodon end def repository - ENV.fetch('GITHUB_REPOSITORY', 'glitch-soc/mastodon') + ENV.fetch('GITHUB_REPOSITORY', 'kescherCode/catstodon') end def source_base_url