diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2017-12-12 17:52:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 17:52:32 -0800 |
| commit | 5ce724bcebebb56914da6efc40b85c4c801e6fe1 (patch) | |
| tree | e6679a7f50ded735baf60a744532e21fa8f51485 /csharp | |
| parent | 0f9bfa8244fcb68f503c7c373651d4eb1180026f (diff) | |
| parent | 75eceb84249cd157dc26af44bb77edb57476c053 (diff) | |
| download | protobuf-5ce724bcebebb56914da6efc40b85c4c801e6fe1.tar.gz protobuf-5ce724bcebebb56914da6efc40b85c4c801e6fe1.tar.bz2 protobuf-5ce724bcebebb56914da6efc40b85c4c801e6fe1.zip | |
Merge pull request #4036 from xfxyjwf/issue3093
Update comments for Timestamp JSON format.
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs index 036be63f..332d74b6 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs @@ -101,7 +101,9 @@ namespace Google.Protobuf.WellKnownTypes { /// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional /// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), /// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone - /// is required, though only UTC (as indicated by "Z") is presently supported. + /// is required. A proto3 JSON serializer should always use UTC (as indicated by + /// "Z") when printing the Timestamp type and a proto3 JSON parser should be + /// able to accept both UTC and other timezones (as indicated by an offset). /// /// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past /// 01:30 UTC on January 15, 2017. |