Skip to content

Liquid 20200205 follow upstream master#3

Open
nasjp wants to merge 7 commits intoliquidfrom
liquid_20200205_follow_upstream_master
Open

Liquid 20200205 follow upstream master#3
nasjp wants to merge 7 commits intoliquidfrom
liquid_20200205_follow_upstream_master

Conversation

@nasjp
Copy link
Copy Markdown

@nasjp nasjp commented Feb 5, 2020

No description provided.

Bryan C. Mills and others added 7 commits August 29, 2019 15:25
Change-Id: If3becd77d77285bce5e39aa211ea48710b52ef46
Reviewed-on: https://go-review.googlesource.com/c/text/+/192324
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
Fixes golang/go#32844

Change-Id: I9d5364df4f827db4de3c144a565c1d05d8a181bd
Reviewed-on: https://go-review.googlesource.com/c/text/+/192325
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
internal/gen/gen.go: build tags manually updated

Generation was without issues.

Change-Id: I280fe3aac73e4e52f61f96f625f69a1218eba794
Reviewed-on: https://go-review.googlesource.com/c/text/+/204497
Reviewed-by: Russ Cox <rsc@golang.org>
If this test is run as a dependency of some other module, the testdata
directory will be read-only. Moreover, if temporary files are written
to the working directory they are likely to interfere with concurrent
version-control operations, such as 'git commit -a'.

Updates golang/go#28387

Change-Id: I15cd9408c63f9b6aed50facbfefa26299392052f
Reviewed-on: https://go-review.googlesource.com/c/text/+/208123
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
When using gotext utility, the output files are always reshuffled,
which makes any kind of source versioning and incremental translation
a real challenge.

This commit sorts the Go files by package name and order index (file
name is not available) before processing the string extraction.

Furthermore, an issue with sorting plural cases has been resolved.
Originally, it sorted ["two", "few", "one", "other"] wrong.

Fixes golang/go#33552

Change-Id: I76fc5d40cf4f989e01ba6d897c0a69029ca30337
Reviewed-on: https://go-review.googlesource.com/c/text/+/207281
Run-TryBot: Jason A. Donenfeld <Jason@zx2c4.com>
Run-TryBot: Marcel van Lohuizen <mpvl@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
When (d *dictionary) Lookup() is called on an non-existing key, the
`messageKeyToIndex[key]` returns 0. As 0 is also a valid entry in
messageKeyToIndex, the method returned the wrong value rather than fail.

Fixes golang/go#35587

Change-Id: Iedd1cf42f29335c2c2052b07993d7f2dfcd3cc6c
Reviewed-on: https://go-review.googlesource.com/c/text/+/207217
Run-TryBot: Jason A. Donenfeld <Jason@zx2c4.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
@nonoswitch nonoswitch changed the base branch from master to liquid February 5, 2020 10:11
@nasjp nasjp force-pushed the liquid_20200205_follow_upstream_master branch from b7b53f4 to bfcd0bb Compare February 5, 2020 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants