claude
d79b30a1a6
The weather line spelled "градусов" out in the template, which is the wrong
form for 1-4 and for every number ending in 1-4. Russian inflects the noun
after a numeral, so the count splits into the number and {word}.
hostWord in cmd/mavend/netscan.go already knew the rule for устройство and was
the only place that did. It moves to internal/phraser as CountWord, with
Degrees and Devices over it, and the three call sites that counted devices now
read the same helper the weather line does. Degrees rounds before it counts, so
the noun agrees with the number she is about to say rather than the reading
behind it, and a negative reading counts by its magnitude.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XGTGCWX33aX8SMBSRz9VmS
48 lines
1.7 KiB
Go
48 lines
1.7 KiB
Go
package phraser
|
|
|
|
// The counted noun, in the form the number in front of it demands.
|
|
//
|
|
// Russian inflects a noun after a numeral, and the form depends on the last two
|
|
// digits: 1 градус, 2 градуса, 5 градусов, 11 градусов, 21 градус, 22 градуса.
|
|
// A line file cannot spell that out, so a count in a template splits into two
|
|
// placeholders — the number, and {word} filled from here.
|
|
//
|
|
// The rule lived once as hostWord in cmd/mavend/netscan.go, which meant the
|
|
// weather line said "градусов" for every temperature and was wrong for 1-4 and
|
|
// for every number ending in 1-4. One helper, every count site (Vikunja #521).
|
|
|
|
import "math"
|
|
|
|
// CountWord picks between the three forms n needs: one for 1, few for 2-4, many
|
|
// for 0, 5-20 and anything ending in those. A negative count reads its own
|
|
// magnitude, since minus does not change the noun: -2 градуса.
|
|
func CountWord(n int, one, few, many string) string {
|
|
if n < 0 {
|
|
n = -n
|
|
}
|
|
if n%100 >= 11 && n%100 <= 14 {
|
|
return many
|
|
}
|
|
switch n % 10 {
|
|
case 1:
|
|
return one
|
|
case 2, 3, 4:
|
|
return few
|
|
default:
|
|
return many
|
|
}
|
|
}
|
|
|
|
// Degrees — the noun for a temperature. Takes the reading as it arrives from a
|
|
// weather provider and counts by the whole degrees she is about to say, so the
|
|
// noun agrees with the number in the same sentence rather than with the reading
|
|
// behind it.
|
|
func Degrees(temp float64) string {
|
|
return CountWord(int(math.Round(temp)), "градус", "градуса", "градусов")
|
|
}
|
|
|
|
// Devices — the noun for a count of hosts on the LAN or of smart-home devices.
|
|
func Devices(n int) string {
|
|
return CountWord(n, "устройство", "устройства", "устройств")
|
|
}
|