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.

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

Clarify where stuff happens #291

Closed
afranke opened this issue Sep 8, 2021 · 31 comments
Closed

Clarify where stuff happens #291

afranke opened this issue Sep 8, 2021 · 31 comments

Comments

@afranke
Copy link

afranke commented Sep 8, 2021

The current situation is quite confusing, and I would even call it broken.

Website

https://smuxi.im/ exists and seems actively maintained (let’s ignore the 2004-2016 copyright notice in the footer). https://wiki.gnome.org/Apps/Smuxi also exists. @aklapper attempted to fix it a bit, but apart from that it had not seen any update since 2014.

If you consider the wiki page obsolete, can you please make a clear statement about it so we change it to redirect people to the right place with up to date information?

Repository

There is this Github repository right here, which seems to be the most current. Then there is the GNOME Gitlab repository which does not have the latest code changes, but has relatively recent activity (from earlier this year). And finally the wiki page gives us https://smuxi.im/repositories/show/smuxi which seems to be lagging a bit behind the Gitlab repo.

Having outdated mirrors is bad enough, especially if they don’t advertise the canonical one, but the Gitlab repo and the Github one have even diverged now. There are recent code commits in Github that are not in Gitlab, and there are translation updates in Gitlab that are not in Github.

Please fix this.

Translations

The website directs at Transifex, but smuxi is also present on Damned lies. The git history shows commits from Damned lies contributors, even as recent as last January, but as I said above the latest ones have not made their way to Github.

If you intend to keep Transifex and stop taking DL contributions (which would be in line with the repository being here and not on GNOME Gitlab), then please state it explicitely so we can remove the module from DL and avoid wasting translator effort.

@meebey
Copy link
Owner

meebey commented Sep 25, 2021

Thanks for pointing these issues out. The git repos have changed over time but not all web page references where correctly updated.

https://wiki.gnome.org/Apps/Smuxi is not really obsolete, because the Smuxi website does not have a public wiki and there are designs that Smuxi hasn't implemented yet, so that content is still relevant. I just tried to update the wiki page to clarify the repo location but it says the page is immutable :/

The canonical git repo is this one on GitHub. All codes changes are also pushed to gitlab.gnome.org, but also used as translation source for translations that are contributed and pushed directly by language teams in GNOME. In addition to the GNOME translations there are languages that have teams on Transifex, the po files reflect that:

$ grep Language-Team po-Frontend-GNOME/*.po
po-Frontend-GNOME/ca.po:"Language-Team: Catalan (http://www.transifex.com/meebey/smuxi/language/ca/)\n"
po-Frontend-GNOME/cs.po:"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
po-Frontend-GNOME/da.po:"Language-Team: Danish (http://www.transifex.com/meebey/smuxi/language/da/)\n"
po-Frontend-GNOME/de.po:"Language-Team: German (http://www.transifex.com/meebey/smuxi/language/de/)\n"
po-Frontend-GNOME/el.po:"Language-Team: team@lists.gnome.gr\n"
po-Frontend-GNOME/en_GB.po:"Language-Team: English-GB <Kimera.Kimera@gmail.com>\n"
po-Frontend-GNOME/es.po:"Language-Team: es <gnome-es-list@gnome.org>\n"
po-Frontend-GNOME/fa.po:"Language-Team: Persian (http://www.transifex.com/meebey/smuxi/language/fa/)\n"
po-Frontend-GNOME/fi.po:"Language-Team: Finnish (http://www.transifex.com/meebey/smuxi/language/fi/)\n"
po-Frontend-GNOME/fr.po:"Language-Team: French (http://www.transifex.com/meebey/smuxi/language/fr/)\n"
po-Frontend-GNOME/hr.po:"Language-Team: Croatian (http://www.transifex.net/projects/p/smuxi/team/hr/)\n"
po-Frontend-GNOME/hu.po:"Language-Team: Hungarian <openscope at gmail dot com>\n"
po-Frontend-GNOME/id.po:"Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
po-Frontend-GNOME/it.po:"Language-Team: Italian <tp@lists.linux.it>\n"
po-Frontend-GNOME/ko.po:"Language-Team: Korean (http://www.transifex.com/meebey/smuxi/language/ko/)\n"
po-Frontend-GNOME/lt.po:"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
po-Frontend-GNOME/nb_NO.po:"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/meebey/smuxi/language/nb_NO/)\n"
po-Frontend-GNOME/nl.po:"Language-Team: Dutch (http://www.transifex.com/projects/p/smuxi/language/"
po-Frontend-GNOME/pl.po:"Language-Team: Polish <community-poland@mozilla.org>\n"
po-Frontend-GNOME/pt_BR.po:"Language-Team: Portuguese - Brazil <gnome-pt_br-list@gnome.org>\n"
po-Frontend-GNOME/pt.po:"Language-Team: Pedro Albuquerque\n"
po-Frontend-GNOME/ro.po:"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
po-Frontend-GNOME/ru.po:"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
po-Frontend-GNOME/sk.po:"Language-Team: Slovak (http://www.transifex.net/projects/p/smuxi/team/sk/)\n"
po-Frontend-GNOME/sl.po:"Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
po-Frontend-GNOME/sr.po:"Language-Team: српски <gnome-sr@googlegroups.org>\n"
po-Frontend-GNOME/sv.po:"Language-Team: Swedish (http://www.transifex.com/meebey/smuxi/language/sv/)\n"
po-Frontend-GNOME/te.po:"Language-Team: Telugu (http://www.transifex.com/projects/p/smuxi/language/te/)\n"
po-Frontend-GNOME/tr.po:"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
po-Frontend-GNOME/ur.po:"Language-Team: Urdu (http://www.transifex.net/projects/p/smuxi/team/ur/)\n"
po-Frontend-GNOME/zh_CN.po:"Language-Team: Chinese (China) (http://www.transifex.com/meebey/smuxi/language/zh_CN/)\n"

Behind https://smuxi.im/repositories/show/smuxi is git.qnetp.net which was the first git repo before the canonical repo was moved over to GitHub but then kept as a mirror. It is now redundant because gitlab.gnome.org is already a mirror in case anything bad happens to the GitHub repo (it is a commercial service after all so I don't want to fully rely on it). I changed https://smuxi.im/repositories/show/smuxi to redirect to this GitHub repo to clear this confusion.

So translations are pulled from 2 different sources: GNOME and Transifex. The translations are merged back into the GitHub repo from time to time, usually before a release so that all translations are part of releases. Since the last release in February this year, 1 language has been updated (Slovenian) in the gitlab.gnome.org repo, which I just merged.
No translators effort is wasted, I care a lot about translations that I spent the extra effort to source both GNOME and Transifex and credit each contribution the release notes.

Hope this clears some things up! I wonder how we can get the repo location fixed on https://wiki.gnome.org/Apps/Smuxi any pointers?

@claudep
Copy link

claudep commented Sep 25, 2021

So translations are pulled from 2 different sources: GNOME and Transifex.

Sorry, but this is not going to work. If a team from GNOME is caring for smuxy translations, they don't want that suddenly a different team may overwrite their work, or contribute with different rules (glossary, conventions, etc.). And I guess the reverse might also be true. And there is always the possibility teams from both sources work in parallel, which will be time wasting. So sorry again, but you will have to make a choice. If you keep merging translations from Transifex, then we'll remove smuxi from l10n.gnome.org.

@aklapper
Copy link
Contributor

@meebey: Hi, could you please make a choice? Thanks a lot in advance.

@aklapper
Copy link
Contributor

aklapper commented Mar 22, 2022

As there has not been a reply by @meebey, I propose to archive https://gitlab.gnome.org/GNOME/smuxi/ and archive https://l10n.gnome.org/module/smuxi/ , and to replace content on https://wiki.gnome.org/Apps/Smuxi and https://wiki.gnome.org/Apps/Smuxi/Design etc by a link to https://smuxi.im/ instead.

@meebey meebey closed this as completed in 9c30bf2 Apr 10, 2022
@meebey
Copy link
Owner

meebey commented Apr 10, 2022

@aklapper we have reviewed the translation situation of the Smuxi project and will no longer import translations from Transifex, but GNOME-only as these are the native and active translation groups.

Smuxi is free software for the GNOME desktop from the start on and adheres to all GNOME standards.

The Transifex integration has been removed from the source tree in 9c30bf2

@meebey
Copy link
Owner

meebey commented Apr 10, 2022

@aklapper the only outstanding part I see is that I want to update the links on the https://wiki.gnome.org/Apps/Smuxi page to be consistent with what was clarified here but the wiki does not let me. Do you know whom I need to reach out to to get the needed write permissions? GNOME sysadmin team perhaps?

@afranke
Copy link
Author

afranke commented Apr 10, 2022

You need to be added to https://wiki.gnome.org/TrustedEditorGroup
What is your WikiName?

@meebey
Copy link
Owner

meebey commented Apr 10, 2022

@afranke it is "MircoBauer"

@afranke
Copy link
Author

afranke commented Apr 10, 2022

You should now be able to edit.

@meebey
Copy link
Owner

meebey commented Apr 10, 2022

@afranke that did trhe trick, thanks! So I have updated the links and removed the outdated part regarding Transifex translations. Should be all correct now.

@claudep
Copy link

claudep commented Apr 10, 2022

https://smuxi.im/contribute/ is still mentioning Transifex as the tool to translate Smuxi.

@meebey
Copy link
Owner

meebey commented Apr 11, 2022

@claudep good catch, fixed: meebey/smuxi-web@3ddbfcd

@claudep
Copy link

claudep commented Apr 11, 2022

👍

@afranke
Copy link
Author

afranke commented Apr 11, 2022

https://smuxi.im/documentation/hacking/ points at github for cloning, while https://wiki.gnome.org/Apps/Smuxi claims the repository is at GNOME gitlab.

@meebey
Copy link
Owner

meebey commented Apr 11, 2022

@afranke oopsy, updated Apps/Smuxi with clarification as well. 👍

@meebey
Copy link
Owner

meebey commented Apr 11, 2022

Sorry about the mess, over the decades things have changed and some pieces got updated while others haven't.... Thanks for pointing out the inconsistencies, appreciated!

@aklapper
Copy link
Contributor

There is an issue tracker at https://smuxi.im/issues . There is an issue tracker at https://github.com/meebey/smuxi/issues/ . There is an issue tracker at https://gitlab.gnome.org/GNOME/smuxi/-/issues

Please define one issue tracker, disable other issue trackers, and check the docs to link to that one issue tracker. Thanks.

@aklapper
Copy link
Contributor

This ticket should remain open until things have been clarified.

@afranke
Copy link
Author

afranke commented Apr 14, 2022

There also still two repositories: Github and GNOME Gitlab. The later is labelled mirror on the wiki page, but Damned lies is still directed at it. That doesn’t work, translators should working against the canonical repository. (Having a read-only mirror is fine and out of scope here).

@claudep would Damned Lies be able to commit to Github, if Mirco decides to keep it as the canonical one?

@claudep
Copy link

claudep commented Apr 14, 2022

@claudep would Damned Lies be able to commit to Github, if Mirco decides to keep it as the canonical one?

Only direct commits to Git repos is supported currently by Damned Lies, not through pull requests. So in theory it would be possible to commit to GitHub, but without the safeguards GNOME GitLab has in place to limit the scope of automatic Damned Lies commits, it is a bit risky.

@meebey meebey reopened this Apr 16, 2022
@meebey
Copy link
Owner

meebey commented Apr 16, 2022

Good point about the different issue trackers. Redmine is the defacto canonical tracker (was used early on) but it has a barrier for people to use so I accept reports via GitHub as well. This open issue is a good example of the better UX, as no additional account is required with the Smuxi project. The GNOME GitLab issue tracker is now disabled, this one was redundant.
I have updated the wiki page and Smuxi site to reflect that where Smuxi users can find old reports and file new ones.

Regarding the git repo, the GNOME one is the canonical one in the context of translations. All GNOME devs and translators have direct write access to it to submit contributions. So for DamnLies I guess it is correct to point it to the GNOME gitlab repo.

@afranke
Copy link
Author

afranke commented Feb 15, 2024

We don’t work off mirrors. I made that clear in #291 (comment)

The situation as I’m writing this, for anyone reading this in the future, is that the repo on GitHub hasn’t seen any activity for the past 8 months while translations have kept coming to the GNOME GitLab repo. I’m putting an end to this madness: the module has been archived on Damned Lies and we won’t be providing translations anymore.

@afranke afranke closed this as completed Feb 15, 2024
@claudep
Copy link

claudep commented Feb 15, 2024

+1 the most sensible things to do for now.

@aklapper
Copy link
Contributor

+1. Thank you, afranke.

@meebey
Copy link
Owner

meebey commented Mar 28, 2024

Regarding the git repo, the GNOME one is the canonical one in the context of translations. All GNOME devs and translators have direct write access to it to submit contributions. So for DamnLies I guess it is correct to point it to the GNOME gitlab repo.

I am not sure why my statement above is seen as git.gnome.org is a mirror of github.com/smuxi which it is not. git allows branches and work to co-exist in different places where you keep merging over time. Thinking about this, is the concern that the source code of git.gnome.org is behind github.com/meebey/smuxi for some time? I tend to "fetch gnome, merge gnome, push *" when I prepare release candidates so a few weeks before the actual release to give translators time.

@meebey
Copy link
Owner

meebey commented Mar 28, 2024

Actually, looking at my .git/config, I continously push to both git repos:

[remote "origin"]
fetch = +refs/heads/:refs/remotes/origin/
url = git@github.com:meebey/smuxi.git
url = git@ssh.gitlab.gnome.org:GNOME/smuxi.git

Thus the source code of git.gnome.org is never behind... What is behind is are the translations on github.com/meebey/smuxi (transitively till I prepare a new release candidate) but why would be that a problem if GNOME treats git.gnome.org as the canoncial source of translations which we previously agreed on?

I value the work of the GNOME translation team a lot, so I want to spot the issue and fix it.

@meebey
Copy link
Owner

meebey commented Mar 28, 2024

Maybe I miss something but would DamnedLies pointing to git.gnome.org/GNOME/smuxi to use it as the canonical repo resolve the matter? So this GitHub repo is mostly just for release preparation (GH actions, etc) and issue tracking?

@aklapper
Copy link
Contributor

For the records, "git.gnome.org" has not existed for a few years.

So this GitHub repo is mostly just for release preparation (GH actions, etc) and issue tracking?

To put it simple: If you want to use GNOME infrastructure, then I'd expect the issue tracker, code repository, translation workflow to use GNOME infrastructure. Anything else creates fragmentation and duplicated efforts.

Maybe I miss something but would DamnedLies pointing to git.gnome.org/GNOME/smuxi to use it as the canonical repo resolve the matter? So this GitHub repo is mostly just for release preparation (GH actions, etc) and issue tracking?

Please see the first sentence in #291 (comment)

@meebey
Copy link
Owner

meebey commented Apr 6, 2024

For the record: Smuxi has been a GNOME git repo since 2014 till 2024 when @afranke decided to archive it.

$ git log | grep -B 2 -i "'gnome/master'"
Date: Fri Mar 29 05:08:12 2024 +0800

Merge branch 'gnome/master'

--
Date: Thu Jun 1 08:37:44 2023 +0800

Merge branch 'gnome/master'

--
Date: Thu Apr 13 20:31:56 2023 +0800

Merge branch 'gnome/master'

--
Date: Sun Apr 10 10:15:07 2022 +0800

Merge branch 'gnome/master'

--
Date: Sat Sep 25 08:45:07 2021 +0800

Merge branch 'gnome/master'

--
Date: Sun Jan 24 22:05:36 2021 +0800

Merge branch 'gnome/master'

--
Date: Mon Jan 4 00:04:53 2021 +0800

Merge branch 'gnome/master'

--
Date: Sun Dec 30 14:00:53 2018 +0100

Merge branch 'gnome/master'

--
Date: Mon Nov 20 23:36:08 2017 +0800

Merge remote-tracking branch 'gnome/master'

--
Date: Sat Nov 4 13:42:33 2017 +0800

Merge remote-tracking branch 'gnome/master'

--
Date: Wed Oct 14 18:46:52 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Tue Sep 1 12:44:36 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Sat Aug 22 13:14:22 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Tue Jul 14 17:35:46 2015 +0200

Merge branch 'gnome/master'

--
Date: Tue Jun 30 08:57:41 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Sat Jun 13 02:14:13 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Sat Jun 6 03:32:20 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Tue Jun 2 21:34:24 2015 +0200

Merge remote-tracking branch 'gnome/master'

--
Date: Sat Sep 27 12:40:02 2014 +0200

Merge remote-tracking branch 'gnome/master'

@meebey
Copy link
Owner

meebey commented Apr 6, 2024

The idea of a single git repo is not secure in my book, as my https://github.com/meebey/smuxi repo or GitHub altogether (in theory, at least) could go down or disappear. Thus, Smuxi always had more than 2 git repos to address single-points-of-failure risk. With GNOME/Infrastructure#1321 the GNOME repository is no longer available to push updates to it.

@aklapper
Copy link
Contributor

aklapper commented Apr 6, 2024

Sure, however GNOME GitLab is not a public free backup service for GitHub repositories.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants