Skip to content

Commit 99e72f6

Browse files
Merge branch '6.3' into 6.4
* 6.3: [WebProfilerBundle] Fix the design of the compact toolbar button Add missing Chinese(zh_TW) translations [VarExporter] Nitpicking in README.md
2 parents c12ab3d + 701741f commit 99e72f6

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
}
4848

4949
.sf-minitoolbar {
50+
--sf-toolbar-gray-800: #262626;
51+
5052
background-color: var(--sf-toolbar-gray-800);
5153
border-top-left-radius: 4px;
5254
bottom: 0;
@@ -66,6 +68,8 @@
6668
}
6769
.sf-minitoolbar svg,
6870
.sf-minitoolbar img {
71+
--sf-toolbar-gray-200: #e5e5e5;
72+
6973
color: var(--sf-toolbar-gray-200);
7074
max-height: 24px;
7175
max-width: 24px;

src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,10 @@
426426
<source>Using hidden overlay characters is not allowed.</source>
427427
<target>不允許使用隱藏的覆蓋字元。</target>
428428
</trans-unit>
429+
<trans-unit id="110">
430+
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431+
<target>無效的副檔名 ({{ extension }}). 允許的副檔名有 {{ extensions }}.</target>
432+
</trans-unit>
429433
</body>
430434
</file>
431435
</xliff>

src/Symfony/Component/VarExporter/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ of objects:
77
- `VarExporter::export()` allows exporting any serializable PHP data structure to
88
plain PHP code. While doing so, it preserves all the semantics associated with
99
the serialization mechanism of PHP (`__wakeup`, `__sleep`, `Serializable`,
10-
`__serialize`, `__unserialize`.)
10+
`__serialize`, `__unserialize`);
1111
- `Instantiator::instantiate()` creates an object and sets its properties without
12-
calling its constructor nor any other methods.
13-
- `Hydrator::hydrate()` can set the properties of an existing object.
12+
calling its constructor nor any other methods;
13+
- `Hydrator::hydrate()` can set the properties of an existing object;
1414
- `Lazy*Trait` can make a class behave as a lazy-loading ghost or virtual proxy.
1515

1616
VarExporter::export()
@@ -26,7 +26,7 @@ Unlike `var_export()`, this works on any serializable PHP value.
2626
It also provides a few improvements over `var_export()`/`serialize()`:
2727

2828
* the output is PSR-2 compatible;
29-
* the output can be re-indented without messing up with `\r` or `\n` in the data
29+
* the output can be re-indented without messing up with `\r` or `\n` in the data;
3030
* missing classes throw a `ClassNotFoundException` instead of being unserialized
3131
to `PHP_Incomplete_Class` objects;
3232
* references involving `SplObjectStorage`, `ArrayObject` or `ArrayIterator`
@@ -61,7 +61,7 @@ Hydrator::hydrate($object, [], [
6161
------------
6262

6363
The component provides two lazy-loading patterns: ghost objects and virtual
64-
proxies (see https://martinfowler.com/eaaCatalog/lazyLoad.html for reference.)
64+
proxies (see https://martinfowler.com/eaaCatalog/lazyLoad.html for reference).
6565

6666
Ghost objects work only with concrete and non-internal classes. In the generic
6767
case, they are not compatible with using factories in their initializer.

0 commit comments

Comments
 (0)