tde-devs@chat.jabb.im < 2021/06/27 >
[00:06]Slávek has left
[00:06]Slávek has joined
[00:37]Slávek: Blu.256, sorry, I forgot in commit log to state that this is your merit - that you are real author :(
[00:37]Slávek: for TDE/tdemainweb-core@780f9908fb
[00:37]tde-bot: [TGW][tdemainweb-core] Update definitions of providers for OpenDesktop contents. · 780f9908fb
https://mirror.git.trinitydesktop.org/gitea/TDE/tdemainweb-core/commit/780f9908fb
[01:21]tde-bot has joined
[01:25]Slávek: Ok, tde-bot updated, so it can now provide information also for other repositories, not just belonging to the TDE organization - see blu.256/twin-style-suse2#1
[01:25]tde-bot: [TGW][twin-style-suse2] #1 - Fixed up DEB packaging.
https://mirror.git.trinitydesktop.org/gitea/blu.256/twin-style-suse2/pulls/1
[01:34]Slávek: BTW, commit blu.256/twin-style-suse2@eea7c57cb1 seems to require additional changes.
[01:34]tde-bot: [TGW][twin-style-suse2] Added CMake l10n rules · eea7c57cb1
https://mirror.git.trinitydesktop.org/gitea/blu.256/twin-style-suse2/commit/eea7c57cb1
[01:35]Slávek: 1. It is unusual that one POT file contains hyphens, while the other underscores.
[01:36]Slávek: 2. It is not correct that there are three POT files in the same directory.
[01:37]Slávek: 3. When it is resolved, it will be good to use tde_condition_add_project_translations( BUILD_TRANSLATIONS ).
[01:41]Slávek: 4. In the code, it is referenced for the client as well as for configuration:
TDEGlobal::locale()->insertCatalogue("twin_SUSE2");
...it should be consistent with the generation of POT file or files.
[04:43]michelec2 has joined
[04:55]michelec2: @Philippe: apologies, I made a small mistake yesterday in my commit for twin-suse
[04:55]michelec2: I create new PR to fix it
[04:55]michelec2: blu.256/twin-style-suse2/pulls/2
[04:55]michelec2: blu.256/twin-style-suse2#2
[04:56]tde-bot: [TGW][twin-style-suse2] #2 - Fixed missing dependency (mistake introduced in commit 2b4b28b13e).
https://mirror.git.trinitydesktop.org/gitea/blu.256/twin-style-suse2/pulls/2
[05:06]michelec2: btw, will you adjust the translations code based on Slavek's feedback before we move it to TDE umbrella? Or do you want me to do that in the transfer process?
[05:07]michelec2: @deKorator: will definitely add that to TDE as well, well done!
[07:29]blu.256: @TDE/tdemainweb-core@780f9908fb it's okay, at least TDEHotNewStuff should work now (I hope)
[07:29]tde-bot: [TGW][tdemainweb-core] Update definitions of providers for OpenDesktop contents. · 780f9908fb
https://mirror.git.trinitydesktop.org/gitea/TDE/tdemainweb-core/commit/780f9908fb
[07:30]michelec2: THNS seems ok now, thanks Philippe
[07:30]blu.256: @translations I'll try to fix them and let you know
[07:31]michelec2: ok, I will wait before moving it into TDE
[07:42]blu.256: blu.256/twin-style-suse2#2 merged
[07:42]tde-bot: [TGW][twin-style-suse2] blu.256/twin-style-suse2: Window decoration formerly used by SUSE 9.3/10.0/10.1, from https://store.kde.org/p/1100399
https://mirror.git.trinitydesktop.org/gitea/blu.256/twin-style-suse2#2/commit/merged
[07:42]tde-bot: [TGW][twin-style-suse2] #2 - Fixed missing dependency (mistake introduced in commit 2b4b28b13e).
https://mirror.git.trinitydesktop.org/gitea/blu.256/twin-style-suse2/pulls/2
[08:09]michelec2: (y)
[08:09]blu.256: I don't quite understand the point of TDEGlobal::locale()->insertCatalogue(...) in the client's code...
[08:11]michelec2: @merge: I just wonder how you merge a PR Philippe. The merge is correct, but I see now the PR says commit N/A and files N/A and the merge seems to have been done from outside TGW
[08:11]michelec2: you can usually merge from the PR page itself
[08:12]michelec2: this way the history is preverved
[08:12]michelec2: *preserved
[08:14]blu.256: Well, I used 'git merge --ff master <branch>'... it was a mistake, wasn't it?
[08:15]michelec2: the merge is fine, no problem. but this ways TGW seems to lose the history of the merge in the PR
[08:16]michelec2: usually, once a PR is ready for merging, you can go to the PR page in TGW. Click the rebase & merge button, click again and that's it. And TGW is happy
[08:17]blu.256: "you can usually merge from the PR page itself": The previous time I did that it produced that "Merged branch ... " message
[08:17]michelec2: only two things to keep in mind is: 1) PR must be able to be fast-forward, to avoid useless "merge" commit
2) when you choose to merge, you need to avoid "merge commit"
[08:17]michelec2: @The previous time: there is a config option in TGW to avoid them
[08:17]Slávek: Note, I tried to enable "Enable autodetect manual merge" in repository settings.
[08:18]Slávek: ...and also disabled checkboxes for merge commits.
[08:19]michelec2: and after the first click on rebase & merge, there should be the choice of how to merge.
[08:19]blu.256: (Y)
[08:19]michelec2: in any case, these are small things, just need to get use to the right way and then it will be automatic to do it right :-)
[08:22]blu.256: I've just created a PR for the translation fixes based on Slavek's comments because I'd like them to be reviewed
[08:25]Slávek: Here is a question whether to create two POT files for messages or whether include all strings in one POT file that is used for both situations (as it was originally)?
[08:26]blu.256: Well, the good thing about the old design is that there was a single file for both.
[08:27]blu.256: The client's .pot contains a single string
[08:27]Slávek: If many strings there are the same in both POT files, it can be more appropriate to have one POT there.
[08:28]blu.256: but it's not present in the config's .pot file
[08:31]Slávek: When I look at the content, it seems advisable to have one POT file there.
[08:31]blu.256: (Y)
[08:32]michelec2: I think one POT file for messages is enoungh
[08:32]michelec2: because it is a small module, self contained
[08:33]blu.256: working on it
[08:33]Slávek: (Y)
[08:33]Slávek: thanks
[08:44]blu.256: should be okay now
[09:00]Slávek: BTW, in this case, you may not have to worry not to indicate SOURCES at all => all relevant files will be automatically used. And at the same time, the keyword CATALOG can also be omitted.
[09:01]Slávek: So, previously used
tde_l10n_create_template( "messages/twin-style-suse2" )
...can work successfully.
[09:02]michelec2: I will be offline for a few hours guyd
[09:02]michelec2: guys
[09:03]michelec2: see you later
[09:03]michelec2 has left
[09:06]blu.256: @Slávek Fixed, thanks. You think I can now merge the PR?
[09:08]Slávek: It seems good. You can probably squash commits into one before merge.
[09:08]blu.256: Yes, of course
[09:40]Slávek: You will do the backport TDE/tdenetwork@e7fdaa7a61 to r14.0.x branch or I should do it?
[09:40]tde-bot: [TGW][tdenetwork] Fixed openDesktop category name · e7fdaa7a61
https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/commit/e7fdaa7a61
[09:44]blu.256: I'll do it
[09:44]blu.256: Only to note that the actual installation seems to fail for all styles
[09:46]Slávek: Is it possible that there is another directory structure within the archive now?
[09:47]blu.256: The problem is, it cannot unpack the archive itself
[09:48]blu.256: it probably fails to detect it as an archive because it uses a filename like /tmp/tde-user/5fQwgz2Fnj (a KTempFile I assume)
[09:49]blu.256: BTW some more categories might need to be adjusted based on output from https://api.opendesktop.org/ocs/v1/content/categories
[10:00]Slávek: It is great that you are already a member of the Core team and you can do such fixes directly, without the need for pull-requests!
[10:13]blu.256: Yes, it is... it would be quite tedious for small changes like this
[10:14]blu.256: I'll now look into the install issue
[10:15]blu.256: I'll also check whether the directory structure inside the archive has changed at all
[10:56]Slávek has left
[11:14]cethyel has joined
[11:16]cethyel has left
[11:25]Slávek has joined
[11:59]blu.256: The bug seems to be fixed with TDE/tdelibs@ad5ff1e012.
[11:59]tde-bot: [TGW][tdelibs] TDEHNS: Respect downloaded file extension. · ad5ff1e012
https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/ad5ff1e012
[12:05]Slávek: Great! ...time to rebuild tdelibs packages in PSB and PTB :)
[12:05]cethyel has joined
[12:11]blu.256: PSB, PTB?
[12:12]blu.256: what are those?
[12:12]Slávek: Deb packages in Preliminary Stable Builds and Preliminary Testing Builds repositories.
[12:12]blu.256: Ah okay
[14:09]cethyel has left
[14:49]michelec2 has joined
[14:51]michelec2: Great, I also noticed the problem with installation, although not for all files
[14:52]michelec2: good to know it should now be fixed. Will test it out!!
[15:18]michelec2: @Philippe: twin-suse2 seems ready now, right?
[15:19]michelec2: if ok, I will try to move it to TDE umbrella tomorrow or worst case tuesday
[15:33]michelec2 has left
[16:16]blu.256: @Michele In my opinion, twin-style-suse2 is indeed okay and ready for the migration
[17:43]Slávek: Blu.256, how about backport TDE/tdebase@baf43828a3 to r14.0.x branch?
[17:43]tde-bot: [TGW][tdebase] KDesktop: Updated category name · baf43828a3
https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/baf43828a3
[17:46]blu.256: Sorry, forgot again...
[17:46]Slávek: :)
[17:46]Slávek: I assumed it :)
[17:48]blu.256: done
[17:48]Slávek: thanks
[18:27]Slávek has left
[18:27]Slávek has joined
[18:28]Slávek has left
[18:29]Slávek has joined
[18:41]Slávek has left
[19:47]Slávek has joined
[22:42]Slávek has left
[23:10]Slávek has joined

tde-devs@chat.jabb.im < 2021/06/27 >