Bug #17072

Improvement comments in puppet scripts for Weblate

Added by Anonymous 2019-09-19 10:41:10 . Updated 2019-09-20 10:27:32 .

Status:
Resolved
Priority:
Normal
Assignee:
intrigeri
Category:
Target version:
Tails_4.0
Start date:
Due date:
% Done:

0%

Feature Branch:
Type of work:
Contributors documentation
Blueprint:

Starter:
Affected tool:
Translation Platform
Deliverable for:
309

Description

Hi hefee,

I am currently reviewing the design doc, and I see some issues in the puppet script comments. I cannot commit there and I’m too lazy to set up a clone and make a pull request. Can you please changes those comments?

Subtasks

History

#1 Updated by Anonymous 2019-09-19 10:41:33

In https://git-tails.immerda.ch/puppet-tails/tree/files/weblate/scripts/update_weblate_git.py

Change

"""Script to merge weblate git(local) from main git (remote).
Tails have different rules, what weblate is allowed to do and how merge conficts
should be handled:
 * po files only modified by local - local version is used.
 * po files modifed by remote and local are merged with @mergePo:
   - mergePo understands the po file formate and does a merge based on the po msgids.
   - if there is a merge conflict on one msgid (remote and local modified the
     content for one msgid), remote is preferred. This makes sure, that Tails
     developers can fix issues in translations over weblate.
 * otherwise remote is preferred.
"""

to

"""Script to merge into weblate git (local) from main git (remote).
Rules about what Weblate is allowed to do and how merge conflicts should be handled:
 * po files only modified locally - local version is used.
 * po files modifed remotely and locally are merged with @mergePo:
   - mergePo understands the po file format and does a merge based on the po msgids.
   - if there is a merge conflict on one msgid (remote and local modified the content for the same msgid), the remote version is preferred. This makes sure that Tails developers can fix issues in translations over weblate.
 * otherwise remote is preferred.
"""

(I’ll add more things here when I find them.)

#2 Updated by intrigeri 2019-09-19 10:56:09

  • Status changed from New to In Progress
  • Assignee deleted (hefee)

> (I’ll add more things here when I find them.)

Given hefee hasn’t commit access to our Puppet code either, it would save us all time if I apply your fixes myself.
Please reassign to me once you’re done: I’d rather emulate patch(1) only once for this ticket.

#3 Updated by Anonymous 2019-09-19 13:38:41

  • Assignee set to intrigeri

I wasn’t aware of this. I did not read many more of these files. So you can go ahead.

#4 Updated by intrigeri 2019-09-19 15:59:47

  • Target version set to Tails_4.0

OK!

#5 Updated by intrigeri 2019-09-19 16:16:58

  • Deliverable for set to Sponsor_L

#6 Updated by intrigeri 2019-09-20 10:27:32

  • Status changed from In Progress to Resolved

Applied + fixed formatting regression. Thanks!