fix: maak enkelvoud en Nederlandse goedkeuringen kloppend
De waarschuwing kiest is/are en beheerder/beheerders apart, en het Nederlands zegt goedkeuring in plaats van approvals. Co-authored-by: tim <tim@timfalken.com>
@@ -171,7 +171,11 @@ var en = map[string]string{
171
171
"appr.developers": "Developers may approve",
172
172
"appr.on": "On",
173
173
"appr.off": "Off",
174
"appr.warn": "This requires %d approvals, and there are %d maintainers.",
174
"appr.warn": "This requires %d approvals, and there are %d maintainers.",
175
"appr.warn.one.one": "This requires %d approval, and there is %d maintainer.",
176
"appr.warn.one.many": "This requires %d approval, and there are %d maintainers.",
177
"appr.warn.many.one": "This requires %d approvals, and there is %d maintainer.",
178
"appr.warn.many.many": "This requires %d approvals, and there are %d maintainers.",
175
179
"appr.locked": "These rules come from the group and cannot be changed here.",
176
180
"rev.title": "Reviews",
177
181
"rev.none": "No reviews yet.",
@@ -180,7 +184,8 @@ var en = map[string]string{
180
184
"rev.rejected": "Rejected",
181
185
"rev.dismissed": "Invalidated",
182
186
"rev.dismiss": "Invalidate review",
183
"rev.summary.approvals": "%d of %d approvals.",
187
"rev.summary.approvals": "%d of %d approvals.",
188
"rev.summary.approvals.one": "%d of %d approval.",
184
189
"rev.summary.changes": "%s requested changes.",
185
190
"rev.summary.rejected": "%s rejected this merge request.",
186
191
"rev.own": "You cannot approve your own merge request.",
@@ -171,7 +171,11 @@ var en = map[string]string{171
"appr.developers": "Developers may approve",171
"appr.developers": "Developers may approve",172
"appr.on": "On",172
"appr.on": "On",173
"appr.off": "Off",173
"appr.off": "Off",174
"appr.warn": "This requires %d approvals, and there are %d maintainers.",174
"appr.warn": "This requires %d approvals, and there are %d maintainers.",175
"appr.warn.one.one": "This requires %d approval, and there is %d maintainer.",176
"appr.warn.one.many": "This requires %d approval, and there are %d maintainers.",177
"appr.warn.many.one": "This requires %d approvals, and there is %d maintainer.",178
"appr.warn.many.many": "This requires %d approvals, and there are %d maintainers.",175
"appr.locked": "These rules come from the group and cannot be changed here.",179
"appr.locked": "These rules come from the group and cannot be changed here.",176
"rev.title": "Reviews",180
"rev.title": "Reviews",177
"rev.none": "No reviews yet.",181
"rev.none": "No reviews yet.",@@ -180,7 +184,8 @@ var en = map[string]string{180
"rev.rejected": "Rejected",184
"rev.rejected": "Rejected",181
"rev.dismissed": "Invalidated",185
"rev.dismissed": "Invalidated",182
"rev.dismiss": "Invalidate review",186
"rev.dismiss": "Invalidate review",183
"rev.summary.approvals": "%d of %d approvals.",187
"rev.summary.approvals": "%d of %d approvals.",188
"rev.summary.approvals.one": "%d of %d approval.",184
"rev.summary.changes": "%s requested changes.",189
"rev.summary.changes": "%s requested changes.",185
"rev.summary.rejected": "%s rejected this merge request.",190
"rev.summary.rejected": "%s rejected this merge request.",186
"rev.own": "You cannot approve your own merge request.",191
"rev.own": "You cannot approve your own merge request.",@@ -174,12 +174,16 @@ var nl = map[string]string{
174
174
"mr.block.failed": "De pipeline is mislukt.",
175
175
"mr.block.waiting": "Deze merge request wacht op een pipeline.",
176
176
"appr.tab": "Goedkeuringen",
177
"appr.required": "Maintainer-approval vereist",
178
"appr.count": "Vereiste approvals",
177
"appr.required": "Goedkeuring van een beheerder vereist",
178
"appr.count": "Vereiste goedkeuringen",
179
179
"appr.developers": "Developers mogen goedkeuren",
180
180
"appr.on": "Aan",
181
181
"appr.off": "Uit",
182
"appr.warn": "Dit vraagt %d approvals, en er zijn %d beheerders.",
182
"appr.warn": "Dit vraagt %d goedkeuringen, en er zijn %d beheerders.",
183
"appr.warn.one.one": "Dit vraagt %d goedkeuring, en er is %d beheerder.",
184
"appr.warn.one.many": "Dit vraagt %d goedkeuring, en er zijn %d beheerders.",
185
"appr.warn.many.one": "Dit vraagt %d goedkeuringen, en er is %d beheerder.",
186
"appr.warn.many.many": "Dit vraagt %d goedkeuringen, en er zijn %d beheerders.",
183
187
"appr.locked": "Deze regels komen van de groep en kunnen hier niet worden aangepast.",
184
188
"rev.title": "Reviews",
185
189
"rev.none": "Nog geen reviews.",
@@ -188,7 +192,8 @@ var nl = map[string]string{
188
192
"rev.rejected": "Afgewezen",
189
193
"rev.dismissed": "Ongeldig verklaard",
190
194
"rev.dismiss": "Review ongeldig verklaren",
191
"rev.summary.approvals": "%d van %d approvals.",
195
"rev.summary.approvals": "%d van %d goedkeuringen.",
196
"rev.summary.approvals.one": "%d van %d goedkeuring.",
192
197
"rev.summary.changes": "%s vraagt wijzigingen.",
193
198
"rev.summary.rejected": "%s heeft deze merge request afgewezen.",
194
199
"rev.own": "Je kunt je eigen merge request niet goedkeuren.",
@@ -741,6 +746,10 @@ var de = map[string]string{
741
746
"appr.on": "An",
742
747
"appr.off": "Aus",
743
748
"appr.warn": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",
749
"appr.warn.one.one": "Das verlangt %d Genehmigung, und es gibt %d Maintainer.",
750
"appr.warn.one.many": "Das verlangt %d Genehmigung, und es gibt %d Maintainer.",
751
"appr.warn.many.one": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",
752
"appr.warn.many.many": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",
744
753
"appr.locked": "Diese Regeln kommen von der Gruppe und können hier nicht geändert werden.",
745
754
"rev.title": "Reviews",
746
755
"rev.none": "Noch keine Reviews.",
@@ -749,7 +758,8 @@ var de = map[string]string{
749
758
"rev.rejected": "Abgelehnt",
750
759
"rev.dismissed": "Ungültig",
751
760
"rev.dismiss": "Review für ungültig erklären",
752
"rev.summary.approvals": "%d von %d Genehmigungen.",
761
"rev.summary.approvals": "%d von %d Genehmigungen.",
762
"rev.summary.approvals.one": "%d von %d Genehmigung.",
753
763
"rev.summary.changes": "%s verlangt Änderungen.",
754
764
"rev.summary.rejected": "%s hat diesen Merge Request abgelehnt.",
755
765
"rev.own": "Du kannst deinen eigenen Merge Request nicht genehmigen.",
@@ -1302,6 +1312,10 @@ var fr = map[string]string{
1302
1312
"appr.on": "Activé",
1303
1313
"appr.off": "Désactivé",
1304
1314
"appr.warn": "Cela exige %d approbations, et il y a %d maintainers.",
1315
"appr.warn.one.one": "Cela exige %d approbation, et il y a %d maintainer.",
1316
"appr.warn.one.many": "Cela exige %d approbation, et il y a %d maintainers.",
1317
"appr.warn.many.one": "Cela exige %d approbations, et il y a %d maintainer.",
1318
"appr.warn.many.many": "Cela exige %d approbations, et il y a %d maintainers.",
1305
1319
"appr.locked": "Ces règles viennent du groupe et ne peuvent pas être modifiées ici.",
1306
1320
"rev.title": "Reviews",
1307
1321
"rev.none": "Pas encore de reviews.",
@@ -1310,7 +1324,8 @@ var fr = map[string]string{
1310
1324
"rev.rejected": "Rejeté",
1311
1325
"rev.dismissed": "Invalidé",
1312
1326
"rev.dismiss": "Invalider la review",
1313
"rev.summary.approvals": "%d approbations sur %d.",
1327
"rev.summary.approvals": "%d approbations sur %d.",
1328
"rev.summary.approvals.one": "%d approbation sur %d.",
1314
1329
"rev.summary.changes": "%s demande des changements.",
1315
1330
"rev.summary.rejected": "%s a rejeté cette merge request.",
1316
1331
"rev.own": "Tu ne peux pas approuver ta propre merge request.",
@@ -174,12 +174,16 @@ var nl = map[string]string{174
"mr.block.failed": "De pipeline is mislukt.",174
"mr.block.failed": "De pipeline is mislukt.",175
"mr.block.waiting": "Deze merge request wacht op een pipeline.",175
"mr.block.waiting": "Deze merge request wacht op een pipeline.",176
"appr.tab": "Goedkeuringen",176
"appr.tab": "Goedkeuringen",177
"appr.required": "Maintainer-approval vereist",177
"appr.required": "Goedkeuring van een beheerder vereist",178
"appr.count": "Vereiste approvals",178
"appr.count": "Vereiste goedkeuringen",179
"appr.developers": "Developers mogen goedkeuren",179
"appr.developers": "Developers mogen goedkeuren",180
"appr.on": "Aan",180
"appr.on": "Aan",181
"appr.off": "Uit",181
"appr.off": "Uit",182
"appr.warn": "Dit vraagt %d approvals, en er zijn %d beheerders.",182
"appr.warn": "Dit vraagt %d goedkeuringen, en er zijn %d beheerders.",183
"appr.warn.one.one": "Dit vraagt %d goedkeuring, en er is %d beheerder.",184
"appr.warn.one.many": "Dit vraagt %d goedkeuring, en er zijn %d beheerders.",185
"appr.warn.many.one": "Dit vraagt %d goedkeuringen, en er is %d beheerder.",186
"appr.warn.many.many": "Dit vraagt %d goedkeuringen, en er zijn %d beheerders.",183
"appr.locked": "Deze regels komen van de groep en kunnen hier niet worden aangepast.",187
"appr.locked": "Deze regels komen van de groep en kunnen hier niet worden aangepast.",184
"rev.title": "Reviews",188
"rev.title": "Reviews",185
"rev.none": "Nog geen reviews.",189
"rev.none": "Nog geen reviews.",@@ -188,7 +192,8 @@ var nl = map[string]string{188
"rev.rejected": "Afgewezen",192
"rev.rejected": "Afgewezen",189
"rev.dismissed": "Ongeldig verklaard",193
"rev.dismissed": "Ongeldig verklaard",190
"rev.dismiss": "Review ongeldig verklaren",194
"rev.dismiss": "Review ongeldig verklaren",191
"rev.summary.approvals": "%d van %d approvals.",195
"rev.summary.approvals": "%d van %d goedkeuringen.",196
"rev.summary.approvals.one": "%d van %d goedkeuring.",192
"rev.summary.changes": "%s vraagt wijzigingen.",197
"rev.summary.changes": "%s vraagt wijzigingen.",193
"rev.summary.rejected": "%s heeft deze merge request afgewezen.",198
"rev.summary.rejected": "%s heeft deze merge request afgewezen.",194
"rev.own": "Je kunt je eigen merge request niet goedkeuren.",199
"rev.own": "Je kunt je eigen merge request niet goedkeuren.",@@ -741,6 +746,10 @@ var de = map[string]string{741
"appr.on": "An",746
"appr.on": "An",742
"appr.off": "Aus",747
"appr.off": "Aus",743
"appr.warn": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",748
"appr.warn": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",749
"appr.warn.one.one": "Das verlangt %d Genehmigung, und es gibt %d Maintainer.",750
"appr.warn.one.many": "Das verlangt %d Genehmigung, und es gibt %d Maintainer.",751
"appr.warn.many.one": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",752
"appr.warn.many.many": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",744
"appr.locked": "Diese Regeln kommen von der Gruppe und können hier nicht geändert werden.",753
"appr.locked": "Diese Regeln kommen von der Gruppe und können hier nicht geändert werden.",745
"rev.title": "Reviews",754
"rev.title": "Reviews",746
"rev.none": "Noch keine Reviews.",755
"rev.none": "Noch keine Reviews.",@@ -749,7 +758,8 @@ var de = map[string]string{749
"rev.rejected": "Abgelehnt",758
"rev.rejected": "Abgelehnt",750
"rev.dismissed": "Ungültig",759
"rev.dismissed": "Ungültig",751
"rev.dismiss": "Review für ungültig erklären",760
"rev.dismiss": "Review für ungültig erklären",752
"rev.summary.approvals": "%d von %d Genehmigungen.",761
"rev.summary.approvals": "%d von %d Genehmigungen.",762
"rev.summary.approvals.one": "%d von %d Genehmigung.",753
"rev.summary.changes": "%s verlangt Änderungen.",763
"rev.summary.changes": "%s verlangt Änderungen.",754
"rev.summary.rejected": "%s hat diesen Merge Request abgelehnt.",764
"rev.summary.rejected": "%s hat diesen Merge Request abgelehnt.",755
"rev.own": "Du kannst deinen eigenen Merge Request nicht genehmigen.",765
"rev.own": "Du kannst deinen eigenen Merge Request nicht genehmigen.",@@ -1302,6 +1312,10 @@ var fr = map[string]string{1302
"appr.on": "Activé",1312
"appr.on": "Activé",1303
"appr.off": "Désactivé",1313
"appr.off": "Désactivé",1304
"appr.warn": "Cela exige %d approbations, et il y a %d maintainers.",1314
"appr.warn": "Cela exige %d approbations, et il y a %d maintainers.",1315
"appr.warn.one.one": "Cela exige %d approbation, et il y a %d maintainer.",1316
"appr.warn.one.many": "Cela exige %d approbation, et il y a %d maintainers.",1317
"appr.warn.many.one": "Cela exige %d approbations, et il y a %d maintainer.",1318
"appr.warn.many.many": "Cela exige %d approbations, et il y a %d maintainers.",1305
"appr.locked": "Ces règles viennent du groupe et ne peuvent pas être modifiées ici.",1319
"appr.locked": "Ces règles viennent du groupe et ne peuvent pas être modifiées ici.",1306
"rev.title": "Reviews",1320
"rev.title": "Reviews",1307
"rev.none": "Pas encore de reviews.",1321
"rev.none": "Pas encore de reviews.",@@ -1310,7 +1324,8 @@ var fr = map[string]string{1310
"rev.rejected": "Rejeté",1324
"rev.rejected": "Rejeté",1311
"rev.dismissed": "Invalidé",1325
"rev.dismissed": "Invalidé",1312
"rev.dismiss": "Invalider la review",1326
"rev.dismiss": "Invalider la review",1313
"rev.summary.approvals": "%d approbations sur %d.",1327
"rev.summary.approvals": "%d approbations sur %d.",1328
"rev.summary.approvals.one": "%d approbation sur %d.",1314
"rev.summary.changes": "%s demande des changements.",1329
"rev.summary.changes": "%s demande des changements.",1315
"rev.summary.rejected": "%s a rejeté cette merge request.",1330
"rev.summary.rejected": "%s a rejeté cette merge request.",1316
"rev.own": "Tu ne peux pas approuver ta propre merge request.",1331
"rev.own": "Tu ne peux pas approuver ta propre merge request.",@@ -18,6 +18,7 @@ type ApprovalView struct {
18
18
GroupPath string
19
19
Maintainers int
20
20
Warn bool
21
WarnText string
21
22
}
22
23
23
24
// ReviewRow is één reviewer op de merge request.
@@ -35,6 +36,7 @@ func (s *Server) fillApproval(r *http.Request, v *View, repo store.Repo) {
35
36
}
36
37
n, _ := s.Store.ProjectMaintainerCount(r.Context(), repo)
37
38
v.Approval = approvalView(pol, groupPath != "", groupPath, n)
39
s.paintApprovalWarn(r, v.Approval)
38
40
}
39
41
40
42
func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {
@@ -44,6 +46,7 @@ func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {
44
46
}
45
47
n, _ := s.Store.GroupMaintainerCount(r.Context(), g.ID)
46
48
v.Approval = approvalView(pol, false, "", n)
49
s.paintApprovalWarn(r, v.Approval)
47
50
}
48
51
49
52
func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maintainers int) *ApprovalView {
@@ -61,6 +64,24 @@ func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maint
61
64
}
62
65
}
63
66
67
func (s *Server) paintApprovalWarn(r *http.Request, a *ApprovalView) {
68
if a == nil || !a.Warn {
69
return
70
}
71
a.WarnText = s.tr(r, approvalWarnKey(a.RequiredCount, a.Maintainers), a.RequiredCount, a.Maintainers)
72
}
73
74
func approvalWarnKey(required, maintainers int) string {
75
req, who := "many", "many"
76
if required == 1 {
77
req = "one"
78
}
79
if maintainers == 1 {
80
who = "one"
81
}
82
return "appr.warn." + req + "." + who
83
}
84
64
85
func (s *Server) saveRepoApproval(w http.ResponseWriter, r *http.Request) {
65
86
_, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
66
87
if !ok || !s.csrfOK(w, r) {
@@ -115,7 +136,11 @@ func (s *Server) reviewBlocks(r *http.Request, repo store.Repo, mr store.MergeRe
115
136
if pol.MaintainerRequired {
116
137
n := s.countApprovals(r.Context(), repo, mr, pol)
117
138
if n < pol.RequiredCount {
118
out = append(out, s.tr(r, "rev.summary.approvals", n, pol.RequiredCount))
139
key := "rev.summary.approvals"
140
if pol.RequiredCount == 1 {
141
key = "rev.summary.approvals.one"
142
}
143
out = append(out, s.tr(r, key, n, pol.RequiredCount))
119
144
}
120
145
}
121
146
reviews, err := s.Store.ListReviews(r.Context(), mr.ID)
@@ -18,6 +18,7 @@ type ApprovalView struct {18
GroupPath string18
GroupPath string19
Maintainers int19
Maintainers int20
Warn bool20
Warn bool21
WarnText string21
}22
}22
23
23
// ReviewRow is één reviewer op de merge request.24
// ReviewRow is één reviewer op de merge request.@@ -35,6 +36,7 @@ func (s *Server) fillApproval(r *http.Request, v *View, repo store.Repo) {35
}36
}36
n, _ := s.Store.ProjectMaintainerCount(r.Context(), repo)37
n, _ := s.Store.ProjectMaintainerCount(r.Context(), repo)37
v.Approval = approvalView(pol, groupPath != "", groupPath, n)38
v.Approval = approvalView(pol, groupPath != "", groupPath, n)39
s.paintApprovalWarn(r, v.Approval)38
}40
}39
41
40
func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {42
func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {@@ -44,6 +46,7 @@ func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {44
}46
}45
n, _ := s.Store.GroupMaintainerCount(r.Context(), g.ID)47
n, _ := s.Store.GroupMaintainerCount(r.Context(), g.ID)46
v.Approval = approvalView(pol, false, "", n)48
v.Approval = approvalView(pol, false, "", n)49
s.paintApprovalWarn(r, v.Approval)47
}50
}48
51
49
func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maintainers int) *ApprovalView {52
func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maintainers int) *ApprovalView {@@ -61,6 +64,24 @@ func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maint61
}64
}62
}65
}63
66
67
func (s *Server) paintApprovalWarn(r *http.Request, a *ApprovalView) {68
if a == nil || !a.Warn {69
return70
}71
a.WarnText = s.tr(r, approvalWarnKey(a.RequiredCount, a.Maintainers), a.RequiredCount, a.Maintainers)72
}73
74
func approvalWarnKey(required, maintainers int) string {75
req, who := "many", "many"76
if required == 1 {77
req = "one"78
}79
if maintainers == 1 {80
who = "one"81
}82
return "appr.warn." + req + "." + who83
}84
64
func (s *Server) saveRepoApproval(w http.ResponseWriter, r *http.Request) {85
func (s *Server) saveRepoApproval(w http.ResponseWriter, r *http.Request) {65
_, repo, _, ok := s.guard(w, r, access.RoleMaintainer)86
_, repo, _, ok := s.guard(w, r, access.RoleMaintainer)66
if !ok || !s.csrfOK(w, r) {87
if !ok || !s.csrfOK(w, r) {@@ -115,7 +136,11 @@ func (s *Server) reviewBlocks(r *http.Request, repo store.Repo, mr store.MergeRe115
if pol.MaintainerRequired {136
if pol.MaintainerRequired {116
n := s.countApprovals(r.Context(), repo, mr, pol)137
n := s.countApprovals(r.Context(), repo, mr, pol)117
if n < pol.RequiredCount {138
if n < pol.RequiredCount {118
out = append(out, s.tr(r, "rev.summary.approvals", n, pol.RequiredCount))139
key := "rev.summary.approvals"140
if pol.RequiredCount == 1 {141
key = "rev.summary.approvals.one"142
}143
out = append(out, s.tr(r, key, n, pol.RequiredCount))119
}144
}120
}145
}121
reviews, err := s.Store.ListReviews(r.Context(), mr.ID)146
reviews, err := s.Store.ListReviews(r.Context(), mr.ID)@@ -93,9 +93,36 @@ func TestReviewsApprovalsAndReopen(t *testing.T) {
93
93
t.Fatal(err)
94
94
}
95
95
page = read(t, res)
96
if !strings.Contains(page, "This requires 3 approvals, and there are 1 maintainers.") {
96
if !strings.Contains(page, "This requires 3 approvals, and there is 1 maintainer.") {
97
97
t.Fatalf("waarschuwing:\n%s", page)
98
98
}
99
res, err = tim.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, page)}, "language": {"nl"}})
100
if err != nil {
101
t.Fatal(err)
102
}
103
_ = read(t, res)
104
res, err = tim.Get(ts.URL + "/tim/gates/-/settings?tab=approvals")
105
if err != nil {
106
t.Fatal(err)
107
}
108
page = read(t, res)
109
for _, want := range []string{
110
"Dit vraagt 3 goedkeuringen, en er is 1 beheerder.",
111
"Vereiste goedkeuringen",
112
"Goedkeuring van een beheerder vereist",
113
} {
114
if !strings.Contains(page, want) {
115
t.Fatalf("nl mist %q:\n%s", want, page)
116
}
117
}
118
if strings.Contains(page, "Vereiste approvals") || strings.Contains(page, "Maintainer-approval") {
119
t.Fatalf("nl houdt het Engelse woord:\n%s", page)
120
}
121
res, err = tim.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, page)}, "language": {"en"}})
122
if err != nil {
123
t.Fatal(err)
124
}
125
page = read(t, res)
99
126
100
127
ctx := context.Background()
101
128
repo, err := st.RepoByPath(ctx, "tim", "gates")
@@ -119,6 +146,9 @@ func TestReviewsApprovalsAndReopen(t *testing.T) {
119
146
if err := st.SaveApproval(ctx, "repo", repo.ID, store.ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1}); err != nil {
120
147
t.Fatal(err)
121
148
}
149
if mrPage := read(t, mustGet(t, tim, ts.URL+"/tim/gates/-/merge-requests/1")); !strings.Contains(mrPage, "0 of 1 approval.") {
150
t.Fatalf("enkelvoud:\n%s", mrPage)
151
}
122
152
123
153
res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, page)}, "status": {"approved"}})
124
154
if err != nil {
@@ -93,9 +93,36 @@ func TestReviewsApprovalsAndReopen(t *testing.T) {93
t.Fatal(err)93
t.Fatal(err)94
}94
}95
page = read(t, res)95
page = read(t, res)96
if !strings.Contains(page, "This requires 3 approvals, and there are 1 maintainers.") {96
if !strings.Contains(page, "This requires 3 approvals, and there is 1 maintainer.") {97
t.Fatalf("waarschuwing:\n%s", page)97
t.Fatalf("waarschuwing:\n%s", page)98
}98
}99
res, err = tim.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, page)}, "language": {"nl"}})100
if err != nil {101
t.Fatal(err)102
}103
_ = read(t, res)104
res, err = tim.Get(ts.URL + "/tim/gates/-/settings?tab=approvals")105
if err != nil {106
t.Fatal(err)107
}108
page = read(t, res)109
for _, want := range []string{110
"Dit vraagt 3 goedkeuringen, en er is 1 beheerder.",111
"Vereiste goedkeuringen",112
"Goedkeuring van een beheerder vereist",113
} {114
if !strings.Contains(page, want) {115
t.Fatalf("nl mist %q:\n%s", want, page)116
}117
}118
if strings.Contains(page, "Vereiste approvals") || strings.Contains(page, "Maintainer-approval") {119
t.Fatalf("nl houdt het Engelse woord:\n%s", page)120
}121
res, err = tim.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, page)}, "language": {"en"}})122
if err != nil {123
t.Fatal(err)124
}125
page = read(t, res)99
126
100
ctx := context.Background()127
ctx := context.Background()101
repo, err := st.RepoByPath(ctx, "tim", "gates")128
repo, err := st.RepoByPath(ctx, "tim", "gates")@@ -119,6 +146,9 @@ func TestReviewsApprovalsAndReopen(t *testing.T) {119
if err := st.SaveApproval(ctx, "repo", repo.ID, store.ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1}); err != nil {146
if err := st.SaveApproval(ctx, "repo", repo.ID, store.ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1}); err != nil {120
t.Fatal(err)147
t.Fatal(err)121
}148
}149
if mrPage := read(t, mustGet(t, tim, ts.URL+"/tim/gates/-/merge-requests/1")); !strings.Contains(mrPage, "0 of 1 approval.") {150
t.Fatalf("enkelvoud:\n%s", mrPage)151
}122
152
123
res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, page)}, "status": {"approved"}})153
res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, page)}, "status": {"approved"}})124
if err != nil {154
if err != nil {@@ -376,7 +376,7 @@
376
376
377
377
{{define "approvalform"}}
378
378
{{if .Approval}}
379
{{if .Approval.Warn}}<p class="flash bad">{{t "appr.warn" .Approval.RequiredCount .Approval.Maintainers}}</p>{{end}}
379
{{if .Approval.Warn}}<p class="flash bad">{{.Approval.WarnText}}</p>{{end}}
380
380
{{if .Approval.Locked}}
381
381
<div class="panel">
382
382
<p>{{t "appr.locked"}} <a href="/groups/{{.Approval.GroupPath}}?tab=settings#approvals">{{.Approval.GroupPath}}</a></p>
@@ -376,7 +376,7 @@376
376
377
{{define "approvalform"}}377
{{define "approvalform"}}378
{{if .Approval}}378
{{if .Approval}}379
{{if .Approval.Warn}}<p class="flash bad">{{t "appr.warn" .Approval.RequiredCount .Approval.Maintainers}}</p>{{end}}379
{{if .Approval.Warn}}<p class="flash bad">{{.Approval.WarnText}}</p>{{end}}380
{{if .Approval.Locked}}380
{{if .Approval.Locked}}381
<div class="panel">381
<div class="panel">382
<p>{{t "appr.locked"}} <a href="/groups/{{.Approval.GroupPath}}?tab=settings#approvals">{{.Approval.GroupPath}}</a></p>382
<p>{{t "appr.locked"}} <a href="/groups/{{.Approval.GroupPath}}?tab=settings#approvals">{{.Approval.GroupPath}}</a></p>