BlueGit

timfa bluegit

fix: schrijf de tagpagina volledig in spijkerschrift

Printf-werkwoorden blijven letterlijk staan, zodat de verwijderdialoog de tagnaam invult. igh en eigh worden als dezelfde tweeklank geschreven als ai.

Co-authored-by: tim <tim@timfalken.com>

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
eb7dced7dc6343fff30f94517420ee2c01a98853
Parent
2ec9a856
Pipeline
Failed
4 files changed +121 −7
internal/i18n/cuneiform.go +73 −4
@@ -4,9 +4,11 @@ import "strings"
4 4
5 5 // Transliterate writes English phonetically in Sumero-Akkadian
6 6 // cuneiform (Unicode U+12000). Digits and punctuation stay, so a
7 // sentence keeps its shape. The spelling is syllabic: consonants
8 // without a following vowel take an inherent a, o is written u,
9 // and there is no separate sign for f, v or o.
7 // sentence keeps its shape. Printf verbs (%s, %d, %q, %%) stay
8 // literal, so a dialog can still substitute a name. The spelling
9 // is syllabic: consonants without a following vowel take an
10 // inherent a, o is written u, and there is no separate sign for
11 // f, v or o. igh and eigh are the same diphthong as ai.
10 12 func Transliterate(s string) string {
11 13 var b strings.Builder
12 14 word := strings.Builder{}
@@ -17,7 +19,15 @@ func Transliterate(s string) string {
17 19 b.WriteString(encodeWord(word.String()))
18 20 word.Reset()
19 21 }
20 for _, r := range s {
22 rs := []rune(s)
23 for i := 0; i < len(rs); i++ {
24 if n := printfVerb(rs[i:]); n > 0 {
25 flush()
26 b.WriteString(string(rs[i : i+n]))
27 i += n - 1
28 continue
29 }
30 r := rs[i]
21 31 if isLetter(r) || r == '\'' {
22 32 word.WriteRune(r)
23 33 continue
@@ -29,6 +39,55 @@ func Transliterate(s string) string {
29 39 return b.String()
30 40 }
31 41
42 // printfVerb is the length of a Go fmt verb at the start of rs,
43 // including %%. Zero means rs does not begin with a verb.
44 func printfVerb(rs []rune) int {
45 if len(rs) < 2 || rs[0] != '%' {
46 return 0
47 }
48 if rs[1] == '%' {
49 return 2
50 }
51 i := 1
52 for i < len(rs) && strings.ContainsRune("#0-+ ", rs[i]) {
53 i++
54 }
55 if i < len(rs) && rs[i] == '[' {
56 j := i + 1
57 for j < len(rs) && rs[j] >= '0' && rs[j] <= '9' {
58 j++
59 }
60 if j > i+1 && j < len(rs) && rs[j] == ']' {
61 i = j + 1
62 }
63 }
64 for i < len(rs) && rs[i] >= '0' && rs[i] <= '9' {
65 i++
66 }
67 if i < len(rs) && rs[i] == '.' {
68 k := i + 1
69 for k < len(rs) && rs[k] >= '0' && rs[k] <= '9' {
70 k++
71 }
72 if k > i+1 {
73 i = k
74 }
75 }
76 if i < len(rs) && isPrintfVerb(rs[i]) {
77 return i + 1
78 }
79 return 0
80 }
81
82 func isPrintfVerb(r rune) bool {
83 switch r {
84 case 'b', 'c', 'd', 'e', 'E', 'f', 'g', 'G', 'o', 'p', 'q', 's', 't', 'T', 'U', 'v', 'w', 'x', 'X':
85 return true
86 default:
87 return false
88 }
89 }
90
32 91 func isLetter(r rune) bool {
33 92 return (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z')
34 93 }
@@ -97,6 +156,16 @@ func phonemes(raw string) []string {
97 156 s := strings.ToLower(raw)
98 157 var out []string
99 158 for i := 0; i < len(s); i++ {
159 if i+3 < len(s) && s[i:i+4] == "eigh" {
160 out = append(out, "e")
161 i += 3
162 continue
163 }
164 if i+2 < len(s) && s[i:i+3] == "igh" {
165 out = append(out, "e")
166 i += 2
167 continue
168 }
100 169 if i+1 < len(s) {
101 170 switch s[i : i+2] {
102 171 case "qu":
@@ -4,9 +4,11 @@ import "strings"
4
4
5// Transliterate writes English phonetically in Sumero-Akkadian
5// Transliterate writes English phonetically in Sumero-Akkadian
6// cuneiform (Unicode U+12000). Digits and punctuation stay, so a
6// cuneiform (Unicode U+12000). Digits and punctuation stay, so a
7// sentence keeps its shape. The spelling is syllabic: consonants
7// sentence keeps its shape. Printf verbs (%s, %d, %q, %%) stay
8// without a following vowel take an inherent a, o is written u,
8// literal, so a dialog can still substitute a name. The spelling
9// and there is no separate sign for f, v or o.
9// is syllabic: consonants without a following vowel take an
10// inherent a, o is written u, and there is no separate sign for
11// f, v or o. igh and eigh are the same diphthong as ai.
10func Transliterate(s string) string {
12func Transliterate(s string) string {
11 var b strings.Builder
13 var b strings.Builder
12 word := strings.Builder{}
14 word := strings.Builder{}
@@ -17,7 +19,15 @@ func Transliterate(s string) string {
17 b.WriteString(encodeWord(word.String()))
19 b.WriteString(encodeWord(word.String()))
18 word.Reset()
20 word.Reset()
19 }
21 }
20 for _, r := range s {
22 rs := []rune(s)
23 for i := 0; i < len(rs); i++ {
24 if n := printfVerb(rs[i:]); n > 0 {
25 flush()
26 b.WriteString(string(rs[i : i+n]))
27 i += n - 1
28 continue
29 }
30 r := rs[i]
21 if isLetter(r) || r == '\'' {
31 if isLetter(r) || r == '\'' {
22 word.WriteRune(r)
32 word.WriteRune(r)
23 continue
33 continue
@@ -29,6 +39,55 @@ func Transliterate(s string) string {
29 return b.String()
39 return b.String()
30}
40}
31
41
42// printfVerb is the length of a Go fmt verb at the start of rs,
43// including %%. Zero means rs does not begin with a verb.
44func printfVerb(rs []rune) int {
45 if len(rs) < 2 || rs[0] != '%' {
46 return 0
47 }
48 if rs[1] == '%' {
49 return 2
50 }
51 i := 1
52 for i < len(rs) && strings.ContainsRune("#0-+ ", rs[i]) {
53 i++
54 }
55 if i < len(rs) && rs[i] == '[' {
56 j := i + 1
57 for j < len(rs) && rs[j] >= '0' && rs[j] <= '9' {
58 j++
59 }
60 if j > i+1 && j < len(rs) && rs[j] == ']' {
61 i = j + 1
62 }
63 }
64 for i < len(rs) && rs[i] >= '0' && rs[i] <= '9' {
65 i++
66 }
67 if i < len(rs) && rs[i] == '.' {
68 k := i + 1
69 for k < len(rs) && rs[k] >= '0' && rs[k] <= '9' {
70 k++
71 }
72 if k > i+1 {
73 i = k
74 }
75 }
76 if i < len(rs) && isPrintfVerb(rs[i]) {
77 return i + 1
78 }
79 return 0
80}
81
82func isPrintfVerb(r rune) bool {
83 switch r {
84 case 'b', 'c', 'd', 'e', 'E', 'f', 'g', 'G', 'o', 'p', 'q', 's', 't', 'T', 'U', 'v', 'w', 'x', 'X':
85 return true
86 default:
87 return false
88 }
89}
90
32func isLetter(r rune) bool {
91func isLetter(r rune) bool {
33 return (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z')
92 return (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z')
34}
93}
@@ -97,6 +156,16 @@ func phonemes(raw string) []string {
97 s := strings.ToLower(raw)
156 s := strings.ToLower(raw)
98 var out []string
157 var out []string
99 for i := 0; i < len(s); i++ {
158 for i := 0; i < len(s); i++ {
159 if i+3 < len(s) && s[i:i+4] == "eigh" {
160 out = append(out, "e")
161 i += 3
162 continue
163 }
164 if i+2 < len(s) && s[i:i+3] == "igh" {
165 out = append(out, "e")
166 i += 2
167 continue
168 }
100 if i+1 < len(s) {
169 if i+1 < len(s) {
101 switch s[i : i+2] {
170 switch s[i : i+2] {
102 case "qu":
171 case "qu":
internal/i18n/i18n.go +4 −2
@@ -75,8 +75,10 @@ func Text(lang Lang, err error) string {
75 75 return err.Error()
76 76 }
77 77
78 // T looks up key and formats it. A missing translation falls back to English,
79 // then to the key itself. Cuneiform is the formatted English, written in signs.
78 // T looks up key and formats it. A missing translation in Nederlands,
79 // Deutsch or Français falls back to English, then to the key itself.
80 // Cuneiform never shows that English: it is the formatted sentence
81 // written in signs, with printf verbs left intact.
80 82 func T(lang Lang, key string, args ...any) string {
81 83 msg := lookup(lang, key)
82 84 if lang == Cuneiform {
@@ -75,8 +75,10 @@ func Text(lang Lang, err error) string {
75 return err.Error()
75 return err.Error()
76}
76}
77
77
78// T looks up key and formats it. A missing translation falls back to English,
78// T looks up key and formats it. A missing translation in Nederlands,
79// then to the key itself. Cuneiform is the formatted English, written in signs.
79// Deutsch or Français falls back to English, then to the key itself.
80// Cuneiform never shows that English: it is the formatted sentence
81// written in signs, with printf verbs left intact.
80func T(lang Lang, key string, args ...any) string {
82func T(lang Lang, key string, args ...any) string {
81 msg := lookup(lang, key)
83 msg := lookup(lang, key)
82 if lang == Cuneiform {
84 if lang == Cuneiform {
internal/i18n/i18n_test.go +35 −0
@@ -51,6 +51,41 @@ func TestCuneiformIsSigns(t *testing.T) {
51 51 if strings.Contains(got, "Delete") {
52 52 t.Fatalf("engels bleef staan: %s", got)
53 53 }
54 pat := T(Cuneiform, "tag.confirm", "%s")
55 if !strings.Contains(pat, "%s") {
56 t.Fatalf("plaatsvervanger weg: %s", pat)
57 }
58 if latin := latinOutsidePrintf(pat); latin != "" {
59 t.Fatalf("engels rond %%s: %q in %s", latin, pat)
60 }
61 if T(Cuneiform, "tag.lightweight") != "𒇷𒋫𒉿𒋫" {
62 t.Fatalf("lightweight: %s", T(Cuneiform, "tag.lightweight"))
63 }
64 if Transliterate("enough") != "𒂊𒉡𒂵𒄩" {
65 t.Fatalf("enough veranderde: %s", Transliterate("enough"))
66 }
67 for key, msg := range en {
68 got = T(Cuneiform, key)
69 if latin := latinOutsidePrintf(got); latin != "" {
70 t.Errorf("%s %q → %q laat %q staan", key, msg, got, latin)
71 }
72 }
73 }
74
75 func latinOutsidePrintf(s string) string {
76 rs := []rune(s)
77 var b strings.Builder
78 for i := 0; i < len(rs); i++ {
79 if n := printfVerb(rs[i:]); n > 0 {
80 i += n - 1
81 continue
82 }
83 r := rs[i]
84 if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') {
85 b.WriteRune(r)
86 }
87 }
88 return b.String()
54 89 }
55 90
56 91 func TestFallback(t *testing.T) {
@@ -51,6 +51,41 @@ func TestCuneiformIsSigns(t *testing.T) {
51 if strings.Contains(got, "Delete") {
51 if strings.Contains(got, "Delete") {
52 t.Fatalf("engels bleef staan: %s", got)
52 t.Fatalf("engels bleef staan: %s", got)
53 }
53 }
54 pat := T(Cuneiform, "tag.confirm", "%s")
55 if !strings.Contains(pat, "%s") {
56 t.Fatalf("plaatsvervanger weg: %s", pat)
57 }
58 if latin := latinOutsidePrintf(pat); latin != "" {
59 t.Fatalf("engels rond %%s: %q in %s", latin, pat)
60 }
61 if T(Cuneiform, "tag.lightweight") != "𒇷𒋫𒉿𒋫" {
62 t.Fatalf("lightweight: %s", T(Cuneiform, "tag.lightweight"))
63 }
64 if Transliterate("enough") != "𒂊𒉡𒂵𒄩" {
65 t.Fatalf("enough veranderde: %s", Transliterate("enough"))
66 }
67 for key, msg := range en {
68 got = T(Cuneiform, key)
69 if latin := latinOutsidePrintf(got); latin != "" {
70 t.Errorf("%s %q → %q laat %q staan", key, msg, got, latin)
71 }
72 }
73}
74
75func latinOutsidePrintf(s string) string {
76 rs := []rune(s)
77 var b strings.Builder
78 for i := 0; i < len(rs); i++ {
79 if n := printfVerb(rs[i:]); n > 0 {
80 i += n - 1
81 continue
82 }
83 r := rs[i]
84 if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') {
85 b.WriteRune(r)
86 }
87 }
88 return b.String()
54}
89}
55
90
56func TestFallback(t *testing.T) {
91func TestFallback(t *testing.T) {
internal/server/tags_test.go +9 −1
@@ -367,7 +367,15 @@ func TestTagsPage(t *testing.T) {
367 367 t.Fatal(err)
368 368 }
369 369 signs := read(t, res)
370 if strings.Contains(signs, "Create tag") || strings.Contains(signs, "Find a tag") || !strings.Contains(signs, "beta") {
370 for _, english := range []string{"Create tag", "Find a tag", "Lightweight", "Delete tag", "Annotated", "Developers cannot"} {
371 if strings.Contains(signs, english) {
372 t.Fatalf("engels %q bleef staan:\n%s", english, signs)
373 }
374 }
375 if !strings.Contains(signs, "beta") || !strings.Contains(signs, `data-pattern="`) || !strings.Contains(signs, "%s") {
371 376 t.Fatalf("spijkerschrift:\n%s", signs)
372 377 }
378 if !strings.Contains(signs, "𒇷𒋫𒉿𒋫") {
379 t.Fatalf("lichtgewicht-tag niet in tekens:\n%s", signs)
380 }
373 381 }
@@ -367,7 +367,15 @@ func TestTagsPage(t *testing.T) {
367 t.Fatal(err)
367 t.Fatal(err)
368 }
368 }
369 signs := read(t, res)
369 signs := read(t, res)
370 if strings.Contains(signs, "Create tag") || strings.Contains(signs, "Find a tag") || !strings.Contains(signs, "beta") {
370 for _, english := range []string{"Create tag", "Find a tag", "Lightweight", "Delete tag", "Annotated", "Developers cannot"} {
371 if strings.Contains(signs, english) {
372 t.Fatalf("engels %q bleef staan:\n%s", english, signs)
373 }
374 }
375 if !strings.Contains(signs, "beta") || !strings.Contains(signs, `data-pattern="`) || !strings.Contains(signs, "%s") {
371 t.Fatalf("spijkerschrift:\n%s", signs)
376 t.Fatalf("spijkerschrift:\n%s", signs)
372 }
377 }
378 if !strings.Contains(signs, "𒇷𒋫𒉿𒋫") {
379 t.Fatalf("lichtgewicht-tag niet in tekens:\n%s", signs)
380 }
373}
381}