Bug 1942257 - Update to latest moz.l10n release r=mach-reviewers,ahal
This includes an upstream patch that fixes bug#1942257 Differential Revision: https://phabricator.services.mozilla.com/D235737
This commit is contained in:
@@ -1,202 +0,0 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata-Version: 2.1
|
||||
Metadata-Version: 2.2
|
||||
Name: moz.l10n
|
||||
Version: 0.5.6
|
||||
Version: 0.5.7
|
||||
Summary: Mozilla tools for localization
|
||||
Author-email: Mozilla <l10n-drivers@mozilla.org>, Eemeli Aro <eemeli@mozilla.com>
|
||||
License: Apache-2.0
|
||||
@@ -22,7 +22,6 @@ Classifier: Topic :: Software Development :: Localization
|
||||
Classifier: Topic :: Software Development :: Testing
|
||||
Requires-Python: ~=3.8
|
||||
Description-Content-Type: text/markdown
|
||||
License-File: LICENSE
|
||||
Requires-Dist: fluent.syntax~=0.19.0
|
||||
Requires-Dist: gitignorant~=0.3.1
|
||||
Requires-Dist: iniparse~=0.5
|
||||
@@ -2,7 +2,7 @@ moz/l10n/__init__.py,sha256=4B1l_B0GtUdbx4a8DzrLzQoPXeISbpBTpqJBZinzLi0,80
|
||||
moz/l10n/message.py,sha256=Af8UafBPaxV04l4sDIS56BhuvPYtl4rzoWqymO7l3oc,3494
|
||||
moz/l10n/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
||||
moz/l10n/bin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
||||
moz/l10n/bin/build.py,sha256=U5IPryUBH933AyO8KfKG_eC2T8wqDxZApfivy3_MOxY,6283
|
||||
moz/l10n/bin/build.py,sha256=2bXbV4DanTN01YHZNl3sxHnmcNYuPIOeSxwzxEwi2pY,6301
|
||||
moz/l10n/bin/build_file.py,sha256=Fc6ig3jbNj_uyQgvONcMYSBDLMxVd4zSjD00tnGLgNU,2577
|
||||
moz/l10n/bin/compare.py,sha256=zq96sPVC9sFhxcw9ZepF-GriKGquKAV6CEMY1q8MSXU,5938
|
||||
moz/l10n/bin/fix.py,sha256=YsJYYTpQ9lcKEoENKMUhbm_HqDXIZN6sBwEfISUZXFg,5791
|
||||
@@ -52,9 +52,8 @@ moz/l10n/resource/xliff/parse_xcode.py,sha256=URmMpBwi1SzrhQKKYM5HKN6-e7eJbXdr8q
|
||||
moz/l10n/resource/xliff/serialize.py,sha256=aPWTu6N8K3-oU6bOIg1BIDPTDIYu6o9XPxjOMf3_WZo,13248
|
||||
moz/l10n/util/__init__.py,sha256=pOy5qLlt_9672xRi-kS6gKp2fBGoQaJW4_Rdnq852yk,68
|
||||
moz/l10n/util/walk_files.py,sha256=v6AcJtpc4Ob7DWRZLIJql1Ez5QE31ZUZKMCJks_ZlIY,2413
|
||||
moz.l10n-0.5.6.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
|
||||
moz.l10n-0.5.6.dist-info/METADATA,sha256=1sJLACeECEf9VXsWHZPJnPuQpxEB4VwfV7pD-VAW0fk,7761
|
||||
moz.l10n-0.5.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
|
||||
moz.l10n-0.5.6.dist-info/entry_points.txt,sha256=_oINhCdl88kDVU8BoEYJNJNcCJ_mJOMa-b5R3e0Wac8,172
|
||||
moz.l10n-0.5.6.dist-info/top_level.txt,sha256=UB_i1Kf-Sdrdhj4PU-iSAlSXxxkEW8hTT9okw5S1SNE,4
|
||||
moz.l10n-0.5.6.dist-info/RECORD,,
|
||||
moz.l10n-0.5.7.dist-info/METADATA,sha256=bx6VlHd15nSVb9ofvq9auR4chJNLIzo67NJtygzXmtc,7739
|
||||
moz.l10n-0.5.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
||||
moz.l10n-0.5.7.dist-info/entry_points.txt,sha256=_oINhCdl88kDVU8BoEYJNJNcCJ_mJOMa-b5R3e0Wac8,172
|
||||
moz.l10n-0.5.7.dist-info/top_level.txt,sha256=UB_i1Kf-Sdrdhj4PU-iSAlSXxxkEW8hTT9okw5S1SNE,4
|
||||
moz.l10n-0.5.7.dist-info/RECORD,,
|
||||
@@ -1,5 +1,5 @@
|
||||
Wheel-Version: 1.0
|
||||
Generator: setuptools (75.6.0)
|
||||
Generator: setuptools (75.8.0)
|
||||
Root-Is-Purelib: true
|
||||
Tag: py3-none-any
|
||||
|
||||
@@ -169,7 +169,7 @@ def write_target_file(
|
||||
|
||||
msg = f"merge {name}"
|
||||
log.info(f"{msg} ({msg_delta:+d})" if msg_delta != 0 else msg)
|
||||
with open(tgt_path, "w") as file:
|
||||
with open(tgt_path, "w", encoding="utf-8") as file:
|
||||
for line in serialize_resource(l10n_res, trim_comments=True):
|
||||
file.write(line)
|
||||
return msg_delta
|
||||
|
||||
2
third_party/python/pyproject.toml
vendored
2
third_party/python/pyproject.toml
vendored
@@ -32,7 +32,7 @@ dependencies = [
|
||||
"mako==1.1.2",
|
||||
# Not direct dependency - only needed to fix a constraint problem
|
||||
"markupsafe==2.0.1",
|
||||
"moz-l10n~=0.5.5",
|
||||
"moz-l10n~=0.5.7",
|
||||
"mozilla-repo-urls==0.1.1",
|
||||
"mozilla-version==3.1.0",
|
||||
"packaging==23.1",
|
||||
|
||||
6
third_party/python/requirements.txt
vendored
6
third_party/python/requirements.txt
vendored
@@ -444,9 +444,9 @@ mdurl==0.1.2 \
|
||||
mohawk==1.1.0 \
|
||||
--hash=sha256:d2a0e3ab10a209cc79e95e28f2dd54bd4a73fd1998ffe27b7ba0f962b6be9723 \
|
||||
--hash=sha256:3ed296a30453d0b724679e0fd41e4e940497f8e461a9a9c3b7f36e43bab0fa09
|
||||
moz-l10n==0.5.6 \
|
||||
--hash=sha256:13dbf9fc56b38ef78ccfd1e188308912bf9125bb4898e0de2ee35b65be5ea25c \
|
||||
--hash=sha256:07b4d88df540e5facc2c9483b44cf33da3ea5c2ce45e5ccb72418680c62e42bb
|
||||
moz-l10n==0.5.7 \
|
||||
--hash=sha256:230d6d2289c66ce8481a4ef3c152025e524132fc4241b35f440d43105796a7c8 \
|
||||
--hash=sha256:ce064640056a2bf659b24152b917452f733a0990e97a2c6c83cfc4bc3276c8d9
|
||||
mozilla-repo-urls==0.1.1 \
|
||||
--hash=sha256:7364da790751db2a060eb45adbf1d7db89a145ed279ba235f3425db9dd255915 \
|
||||
--hash=sha256:30510d3519479aa70211145d0ac9cf6e2fadcb8d30fa3b196bb957bd773502ba
|
||||
|
||||
8
third_party/python/uv.lock
generated
vendored
8
third_party/python/uv.lock
generated
vendored
@@ -816,7 +816,7 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "moz-l10n"
|
||||
version = "0.5.6"
|
||||
version = "0.5.7"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
dependencies = [
|
||||
{ name = "fluent-syntax" },
|
||||
@@ -825,9 +825,9 @@ dependencies = [
|
||||
{ name = "polib" },
|
||||
{ name = "tomli", marker = "python_full_version < '3.11'" },
|
||||
]
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/13/37/53e6f27a26323f7070d5f73b0c07c34ebaa1ad30c38b66fff4119fe50cf8/moz_l10n-0.5.6.tar.gz", hash = "sha256:13dbf9fc56b38ef78ccfd1e188308912bf9125bb4898e0de2ee35b65be5ea25c", size = 69167 }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/5f/63/7036d277532b6e2d213eba0bb949746fcbbca6a89d36497233f1e1516279/moz_l10n-0.5.7.tar.gz", hash = "sha256:230d6d2289c66ce8481a4ef3c152025e524132fc4241b35f440d43105796a7c8", size = 68451 }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/07/07/d38c159e533e0457519fe46d948a1b10474effc314b7456bf39eef36334f/moz.l10n-0.5.6-py3-none-any.whl", hash = "sha256:07b4d88df540e5facc2c9483b44cf33da3ea5c2ce45e5ccb72418680c62e42bb", size = 93347 },
|
||||
{ url = "https://files.pythonhosted.org/packages/2c/cb/fe7ae1e45b17e1c51462194702a8fabed6ab41e609745a14c835fec47a5b/moz.l10n-0.5.7-py3-none-any.whl", hash = "sha256:ce064640056a2bf659b24152b917452f733a0990e97a2c6c83cfc4bc3276c8d9", size = 89207 },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -934,7 +934,7 @@ requires-dist = [
|
||||
{ name = "looseversion", specifier = "==1.0.1" },
|
||||
{ name = "mako", specifier = "==1.1.2" },
|
||||
{ name = "markupsafe", specifier = "==2.0.1" },
|
||||
{ name = "moz-l10n", specifier = "~=0.5.5" },
|
||||
{ name = "moz-l10n", specifier = "~=0.5.7" },
|
||||
{ name = "mozilla-repo-urls", specifier = "==0.1.1" },
|
||||
{ name = "mozilla-version", specifier = "==3.1.0" },
|
||||
{ name = "packaging", specifier = "==23.1" },
|
||||
|
||||
2
third_party/python/uv.lock.hash
vendored
2
third_party/python/uv.lock.hash
vendored
@@ -1 +1 @@
|
||||
a3c302912005ee7e2a70fa7ed4346dc5216081091ee31ab7d104026e232992a8
|
||||
8a4cf1cfcf12168f7bc670ca01e1d8a0276b1c53453144a25ae3c174175c2c6a
|
||||
Reference in New Issue
Block a user