hash,date,author,commit_message,is_merge,git_diff,type,masked_commit_message d06d01cef2f81025d1b9617407f573ee916cb84c,2023-10-20 22:55:07,Steven,chore: release mysql driver,False,"diff --git a/store/db/db.go b/store/db/db.go index 4ba27c4c0de93..23386050c126f 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -14,11 +14,6 @@ func NewDBDriver(profile *profile.Profile) (store.Driver, error) { var driver store.Driver var err error - // As mysql driver is not fully implemented, we use sqlite for now in prod mode. - if profile.Mode == ""prod"" && profile.Driver != ""sqlite"" { - return nil, errors.New(""Only SQLite is supported in prod mode"") - } - switch profile.Driver { case ""sqlite"": driver, err = sqlite.NewDB(profile)",chore,release mysql driver 77b92f675ad75197f88a7cd418a68938c5eca63e,2024-06-19 19:40:38,dependabot[bot],chore: bump @bufbuild/buf from 1.32.2 to 1.33.0 in /web (#3586),False,"diff --git a/web/package.json b/web/package.json index 49c30d50a16e8..0562b444ce2dd 100644 --- a/web/package.json +++ b/web/package.json @@ -42,7 +42,7 @@ ""zustand"": ""^4.5.2"" }, ""devDependencies"": { - ""@bufbuild/buf"": ""^1.32.1"", + ""@bufbuild/buf"": ""^1.33.0"", ""@trivago/prettier-plugin-sort-imports"": ""^4.3.0"", ""@types/d3"": ""^7.4.3"", ""@types/dompurify"": ""^3.0.5"", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index c0dcb3bf124de..5b9c87afd822d 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -101,8 +101,8 @@ dependencies: devDependencies: '@bufbuild/buf': - specifier: ^1.32.1 - version: 1.32.2 + specifier: ^1.33.0 + version: 1.33.0 '@trivago/prettier-plugin-sort-imports': specifier: ^4.3.0 version: 4.3.0(prettier@3.3.2) @@ -455,8 +455,8 @@ packages: resolution: {integrity: sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==} dev: false - /@bufbuild/buf-darwin-arm64@1.32.2: - resolution: {integrity: sha512-AR6WlhY6CmLlZetvYzLjbyVpU5jM4eDd3PRTUAK5NcpqIPdCMiMK9nc33Yxc8pO04Lv4yrYdzWnFqZdbCzsS2g==} + /@bufbuild/buf-darwin-arm64@1.33.0: + resolution: {integrity: sha512-h2CKZUS3apPDxuB/HQHIvbzh+xXVsRik7w/AbeYO1r9PKjdet/8F53t3KrdQa4NFF948JGxQ/0/1VvVowjjZUA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -464,8 +464,8 @@ packages: dev: true optional: true - /@bufbuild/buf-darwin-x64@1.32.2: - resolution: {integrity: sha512-ZmVYsMcS06KHZYy4DmKf95BnDWji5/xo42oybqjtlE/wPGKNpqgiq0UGHSlK0oCh67sybHidXVci6LC95xHNrw==} + /@bufbuild/buf-darwin-x64@1.33.0: + resolution: {integrity: sha512-DMBkAJVwwRHF0gwiCWyqToOVfcNAU8WYOkE3M2NYvQDIdeiSKw0+OjD0l+CYfppMOGh9MJWQV7di96ugDO+VbA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -473,8 +473,8 @@ packages: dev: true optional: true - /@bufbuild/buf-linux-aarch64@1.32.2: - resolution: {integrity: sha512-OG509xwJHjuzSn5nNrVWghW/RpB76Ovhj7LCKi52QVh/qQq6VUXeQk42XIWjXY/Cmzmg81G7t97kLw27JLzH0w==} + /@bufbuild/buf-linux-aarch64@1.33.0: + resolution: {integrity: sha512-68OxC000rHtXzV2zxHXJ54ZkkPy/3yrm9HLALo8vUk4p5/fupwzjkGMQqD6BmL/ThDO8AX3jUvhJUAg+kS1+Hw==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -482,8 +482,8 @@ packages: dev: true optional: true - /@bufbuild/buf-linux-x64@1.32.2: - resolution: {integrity: sha512-TFNN87nhLyGFUKOy3beU/0GZk7TEs57J5VQczSq83rHLC+7t1nDuk5Rew8QEyV0OzEzZF+BkpLZj0jY+dWg6/g==} + /@bufbuild/buf-linux-x64@1.33.0: + resolution: {integrity: sha512-KsED6sanzwZCviSCMlq/P2yuuTVbgWGeUmS9CGsVn28sdjFCJb7bNhB6CKpUhox617XwqTPYZzEulQ1fF/sqJg==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -491,8 +491,8 @@ packages: dev: true optional: true - /@bufbuild/buf-win32-arm64@1.32.2: - resolution: {integrity: sha512-SsGUfILZblPNbCgG6W9DxzCdfHnT2YTYQEkCS877DL1wkWMlMJ/ijZA9Cg2fx8NrLKzFTKC1nlTfqRBcLPf2Mg==} + /@bufbuild/buf-win32-arm64@1.33.0: + resolution: {integrity: sha512-QEGjUNEDI2zfajtHlbjZsM05ya9dtza5X3q95IeUJmy+7NOhV9OOLqtWnHv2iCh1zvyzefKSXWfmQhNs+M/0qA==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -500,8 +500,8 @@ packages: dev: true optional: true - /@bufbuild/buf-win32-x64@1.32.2: - resolution: {integrity: sha512-FXOHmXB0kxQ7nQ0JYWpByl6/ebkKwWPPjucOHIDcfo7czg5ZD/fRusb738YJ1qeN+5RXybkvhJIrewxVnhYuhg==} + /@bufbuild/buf-win32-x64@1.33.0: + resolution: {integrity: sha512-JdPxQc7m5L6BsMzrqecKGmgJSYn3k3389dFtEXIEB2D7u2G3AWoRbPluzggo6udBYtjq+ZMdErdPjDDknNQvEg==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -509,18 +509,18 @@ packages: dev: true optional: true - /@bufbuild/buf@1.32.2: - resolution: {integrity: sha512-WL2mpou8k9EBo2US0KyZhFSHrDmRZvv5ZMp7lywUFb+3lW1+E/OZnBaBYTrSAb9vfzSmwdRsSOJwKdDpfbjdSg==} + /@bufbuild/buf@1.33.0: + resolution: {integrity: sha512-VnXdRDsfr1aO7gqy/geVK4/r9w4K6lj3ypsZwu75gdXMq9QXtOmdEO6QqlXO/BpjYG4Aw/Z6Bt/WEezA6hqJow==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@bufbuild/buf-darwin-arm64': 1.32.2 - '@bufbuild/buf-darwin-x64': 1.32.2 - '@bufbuild/buf-linux-aarch64': 1.32.2 - '@bufbuild/buf-linux-x64': 1.32.2 - '@bufbuild/buf-win32-arm64': 1.32.2 - '@bufbuild/buf-win32-x64': 1.32.2 + '@bufbuild/buf-darwin-arm64': 1.33.0 + '@bufbuild/buf-darwin-x64': 1.33.0 + '@bufbuild/buf-linux-aarch64': 1.33.0 + '@bufbuild/buf-linux-x64': 1.33.0 + '@bufbuild/buf-win32-arm64': 1.33.0 + '@bufbuild/buf-win32-x64': 1.33.0 dev: true /@dnd-kit/accessibility@3.1.0(react@18.3.1):",chore,bump @bufbuild/buf from 1.32.2 to 1.33.0 in /web (#3586) 54a3c25ebde5d1bde113adc2c595a6a88defd002,2024-03-30 05:56:28,Steven,chore: update memo resource name definition,False,"diff --git a/proto/api/v2/resource_service.proto b/proto/api/v2/resource_service.proto index cfac871348393..4a12d8bb2ad3f 100644 --- a/proto/api/v2/resource_service.proto +++ b/proto/api/v2/resource_service.proto @@ -61,7 +61,8 @@ message Resource { int64 size = 7; - optional int32 memo_id = 8; + // Format: memos/{id} + optional string memo = 8; } message CreateResourceRequest { @@ -71,7 +72,8 @@ message CreateResourceRequest { string type = 3; - optional int32 memo_id = 4; + // Format: memos/{id} + optional string memo = 4; } message CreateResourceResponse { diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.md index 0a11250b7e721..ef705e4e4be77 100644 --- a/proto/gen/api/v2/README.md +++ b/proto/gen/api/v2/README.md @@ -1332,7 +1332,7 @@ Used internally for obfuscating the page token. | filename | [string](#string) | | | | external_link | [string](#string) | | | | type | [string](#string) | | | -| memo_id | [int32](#int32) | optional | | +| memo | [string](#string) | optional | Format: memos/{id} | @@ -1449,7 +1449,7 @@ Used internally for obfuscating the page token. | external_link | [string](#string) | | | | type | [string](#string) | | | | size | [int64](#int64) | | | -| memo_id | [int32](#int32) | optional | | +| memo | [string](#string) | optional | Format: memos/{id} | diff --git a/proto/gen/api/v2/resource_service.pb.go b/proto/gen/api/v2/resource_service.pb.go index 211986f768a97..c58a03b35948a 100644 --- a/proto/gen/api/v2/resource_service.pb.go +++ b/proto/gen/api/v2/resource_service.pb.go @@ -39,7 +39,8 @@ type Resource struct { ExternalLink string `protobuf:""bytes,5,opt,name=external_link,json=externalLink,proto3"" json:""external_link,omitempty""` Type string `protobuf:""bytes,6,opt,name=type,proto3"" json:""type,omitempty""` Size int64 `protobuf:""varint,7,opt,name=size,proto3"" json:""size,omitempty""` - MemoId *int32 `protobuf:""varint,8,opt,name=memo_id,json=memoId,proto3,oneof"" json:""memo_id,omitempty""` + // Format: memos/{id} + Memo *string `protobuf:""bytes,8,opt,name=memo,proto3,oneof"" json:""memo,omitempty""` } func (x *Resource) Reset() { @@ -123,11 +124,11 @@ func (x *Resource) GetSize() int64 { return 0 } -func (x *Resource) GetMemoId() int32 { - if x != nil && x.MemoId != nil { - return *x.MemoId +func (x *Resource) GetMemo() string { + if x != nil && x.Memo != nil { + return *x.Memo } - return 0 + return """" } type CreateResourceRequest struct { @@ -138,7 +139,8 @@ type CreateResourceRequest struct { Filename string `protobuf:""bytes,1,opt,name=filename,proto3"" json:""filename,omitempty""` ExternalLink string `protobuf:""bytes,2,opt,name=external_link,json=externalLink,proto3"" json:""external_link,omitempty""` Type string `protobuf:""bytes,3,opt,name=type,proto3"" json:""type,omitempty""` - MemoId *int32 `protobuf:""varint,4,opt,name=memo_id,json=memoId,proto3,oneof"" json:""memo_id,omitempty""` + // Format: memos/{id} + Memo *string `protobuf:""bytes,4,opt,name=memo,proto3,oneof"" json:""memo,omitempty""` } func (x *CreateResourceRequest) Reset() { @@ -194,11 +196,11 @@ func (x *CreateResourceRequest) GetType() string { return """" } -func (x *CreateResourceRequest) GetMemoId() int32 { - if x != nil && x.MemoId != nil { - return *x.MemoId +func (x *CreateResourceRequest) GetMemo() string { + if x != nil && x.Memo != nil { + return *x.Memo } - return 0 + return """" } type CreateResourceResponse struct { @@ -721,7 +723,7 @@ var file_api_v2_resource_service_proto_rawDesc = []byte{ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80, 0x02, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, + 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf8, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x72, @@ -735,19 +737,18 @@ var file_api_v2_resource_service_proto_rawDesc = []byte{ 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, - 0x12, 0x1c, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x6f, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0a, - 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x5f, 0x69, 0x64, 0x22, 0x96, 0x01, 0x0a, 0x15, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x6e, - 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x07, 0x6d, 0x65, 0x6d, - 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x65, - 0x6d, 0x6f, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, - 0x5f, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, + 0x12, 0x17, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, + 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6d, 0x65, + 0x6d, 0x6f, 0x22, 0x8e, 0x01, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, + 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x78, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0c, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x12, 0x0a, + 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x17, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x00, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6d, + 0x65, 0x6d, 0x6f, 0x22, 0x4c, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, diff --git a/server/route/api/v2/apidocs.swagger.yaml b/server/route/api/v2/apidocs.swagger.yaml index 5363cd007049c..d6652e275799e 100644 --- a/server/route/api/v2/apidocs.swagger.yaml +++ b/server/route/api/v2/apidocs.swagger.yaml @@ -346,11 +346,11 @@ paths: in: query required: false type: string - - name: memoId + - name: memo + description: 'Format: memos/{id}' in: query required: false - type: integer - format: int32 + type: string tags: - ResourceService /api/v2/resources:search: @@ -1476,9 +1476,9 @@ paths: size: type: string format: int64 - memoId: - type: integer - format: int32 + memo: + type: string + title: 'Format: memos/{id}' tags: - ResourceService /api/v2/{setting.name}: @@ -2183,9 +2183,9 @@ definitions: size: type: string format: int64 - memoId: - type: integer - format: int32 + memo: + type: string + title: 'Format: memos/{id}' v2SearchMemosResponse: type: object properties: diff --git a/server/route/api/v2/resource_service.go b/server/route/api/v2/resource_service.go index 1187f2f39c460..705f78c2068e8 100644 --- a/server/route/api/v2/resource_service.go +++ b/server/route/api/v2/resource_service.go @@ -41,8 +41,12 @@ func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.Crea ExternalLink: request.ExternalLink, Type: request.Type, } - if request.MemoId != nil { - create.MemoID = request.MemoId + if request.Memo != nil { + memoID, err := ExtractMemoIDFromName(*request.Memo) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, ""invalid memo id: %v"", err) + } + create.MemoID = &memoID } resource, err := s.Store.CreateResource(ctx, create) if err != nil { @@ -139,8 +143,15 @@ func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.Upda for _, field := range request.UpdateMask.Paths { if field == ""filename"" { update.Filename = &request.Resource.Filename - } else if field == ""memo_id"" { - update.MemoID = request.Resource.MemoId + } else if field == ""memo"" { + if request.Resource.Memo == nil { + return nil, status.Errorf(codes.InvalidArgument, ""memo is required"") + } + memoID, err := ExtractMemoIDFromName(*request.Resource.Memo) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, ""invalid memo id: %v"", err) + } + update.MemoID = &memoID } } @@ -182,17 +193,7 @@ func (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.Dele } func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *store.Resource) *apiv2pb.Resource { - var memoID *int32 - if resource.MemoID != nil { - memo, _ := s.Store.GetMemo(ctx, &store.FindMemo{ - ID: resource.MemoID, - }) - if memo != nil { - memoID = &memo.ID - } - } - - return &apiv2pb.Resource{ + resourceMessage := &apiv2pb.Resource{ Name: fmt.Sprintf(""%s%d"", ResourceNamePrefix, resource.ID), Uid: resource.UID, CreateTime: timestamppb.New(time.Unix(resource.CreatedTs, 0)), @@ -200,8 +201,18 @@ func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *s ExternalLink: resource.ExternalLink, Type: resource.Type, Size: resource.Size, - MemoId: memoID, } + if resource.MemoID != nil { + memo, _ := s.Store.GetMemo(ctx, &store.FindMemo{ + ID: resource.MemoID, + }) + if memo != nil { + memoName := fmt.Sprintf(""%s%d"", MemoNamePrefix, memo.ID) + resourceMessage.Memo = &memoName + } + } + + return resourceMessage } // SearchResourcesFilterCELAttributes are the CEL attributes for SearchResourcesFilter. diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx index 31fa5d375b624..51cc283c620cb 100644 --- a/web/src/components/MemoEditor/index.tsx +++ b/web/src/components/MemoEditor/index.tsx @@ -8,7 +8,7 @@ import { TAB_SPACE_WIDTH } from ""@/helpers/consts""; import { isValidUrl } from ""@/helpers/utils""; import useCurrentUser from ""@/hooks/useCurrentUser""; import { useGlobalStore, useResourceStore, useTagStore } from ""@/store/module""; -import { extractMemoIdFromName, useMemoStore, useUserStore } from ""@/store/v1""; +import { useMemoStore, useUserStore } from ""@/store/v1""; import { MemoRelation, MemoRelation_Type } from ""@/types/proto/api/v2/memo_relation_service""; import { Memo, Visibility } from ""@/types/proto/api/v2/memo_service""; import { Resource } from ""@/types/proto/api/v2/resource_service""; @@ -233,9 +233,9 @@ const MemoEditor = (props: Props) => { await resourceStore.updateResource({ resource: Resource.fromPartial({ name: resource.name, - memoId: extractMemoIdFromName(memoName), + memo: memoName, }), - updateMask: [""memo_id""], + updateMask: [""memo""], }); } } diff --git a/web/src/helpers/utils.ts b/web/src/helpers/utils.ts index 5679538280334..e6d517b49ca5f 100644 --- a/web/src/helpers/utils.ts +++ b/web/src/helpers/utils.ts @@ -1,57 +1,3 @@ -export const isNullorUndefined = (value: any) => { - return value === null || value === undefined; -}; - -export const getElementBounding = (element: HTMLElement, relativeEl?: HTMLElement) => { - const scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop; - const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft; - - relativeEl = relativeEl || document.body; - - const elementRect = element.getBoundingClientRect(); - const relativeElRect = relativeEl.getBoundingClientRect(); - const relativeElPosition = window.getComputedStyle(relativeEl).getPropertyValue(""position""); - - const bounding = { - width: elementRect.width, - height: elementRect.height, - }; - - if ((relativeEl.tagName !== ""BODY"" && relativeElPosition === ""relative"") || relativeElPosition === ""sticky"") { - return Object.assign(bounding, { - top: elementRect.top - relativeElRect.top, - left: elementRect.left - relativeElRect.left, - }); - } - - const isElementFixed = (element: HTMLElement): boolean => { - const parentNode = element.parentNode; - - if (!parentNode || parentNode.nodeName === ""HTML"") { - return false; - } - - const position = window.getComputedStyle(element).getPropertyValue(""position""); - if (position === ""fixed"" || position === ""static"") { - return true; - } - - return isElementFixed(parentNode as HTMLElement); - }; - - if (isElementFixed(element)) { - return Object.assign(bounding, { - top: elementRect.top, - left: elementRect.left, - }); - } - - return Object.assign(bounding, { - top: elementRect.top + scrollTop, - left: elementRect.left + scrollLeft, - }); -}; - export function absolutifyLink(rel: string): string { const anchor = document.createElement(""a""); anchor.setAttribute(""href"", rel); @@ -75,15 +21,6 @@ export function convertFileToBase64(file: File): Promise { }); } -export const formatBytes = (bytes: number) => { - if (bytes <= 0) return ""0 Bytes""; - const k = 1024, - dm = 2, - sizes = [""Bytes"", ""KiB"", ""MiB"", ""GiB"", ""TiB"", ""PiB"", ""EiB"", ""ZiB"", ""YiB""], - i = Math.floor(Math.log(bytes) / Math.log(k)); - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + "" "" + sizes[i]; -}; - export const isValidUrl = (url: string): boolean => { try { new URL(url); diff --git a/web/src/pages/Resources.tsx b/web/src/pages/Resources.tsx index 78b83a8eee786..f1bb77b92366e 100644 --- a/web/src/pages/Resources.tsx +++ b/web/src/pages/Resources.tsx @@ -10,7 +10,7 @@ import ResourceIcon from ""@/components/ResourceIcon""; import { resourceServiceClient } from ""@/grpcweb""; import useLoading from ""@/hooks/useLoading""; import i18n from ""@/i18n""; -import { MemoNamePrefix, extractMemoIdFromName, useMemoStore } from ""@/store/v1""; +import { extractMemoIdFromName, useMemoStore } from ""@/store/v1""; import { Resource } from ""@/types/proto/api/v2/resource_service""; import { useTranslate } from ""@/utils/i18n""; @@ -49,16 +49,14 @@ const Resources = () => { const memoStore = useMemoStore(); const [resources, setResources] = useState([]); const filteredResources = resources.filter((resource) => includes(resource.filename, state.searchQuery)); - const groupedResources = groupResourcesByDate(filteredResources.filter((resource) => resource.memoId)); - const unusedResources = filteredResources.filter((resource) => !resource.memoId); + const groupedResources = groupResourcesByDate(filteredResources.filter((resource) => resource.memo)); + const unusedResources = filteredResources.filter((resource) => !resource.memo); useEffect(() => { resourceServiceClient.listResources({}).then(({ resources }) => { setResources(resources); loadingState.setFinish(); - Promise.all( - resources.map((resource: any) => (resource.memoId ? memoStore.getOrFetchMemoByName(`${MemoNamePrefix}${resource.memoId}`) : null)), - ); + Promise.all(resources.map((resource) => (resource.memo ? memoStore.getOrFetchMemoByName(resource.memo) : null))); }); }, []); @@ -72,7 +70,7 @@ const Resources = () => { for (const resource of unusedResources) { await resourceServiceClient.deleteResource({ name: resource.name }); } - setResources(resources.filter((resource) => resource.memoId)); + setResources(resources.filter((resource) => resource.memo)); }, }); }; @@ -121,7 +119,7 @@ const Resources = () => {
{resources.map((resource) => { - const relatedMemo = resource.memoId ? memoStore.getMemoByName(`${MemoNamePrefix}${resource.memoId}`) : null; + const relatedMemo = resource.memo ? memoStore.getMemoByName(resource.memo) : null; return (
",chore,update memo resource name definition 9957f8e290e210642bcbd5a62083fcf78fa88b05,2025-02-07 18:29:14,Steven,chore: move dsn output to dev mode,False,"diff --git a/bin/memos/main.go b/bin/memos/main.go index 4e0f7709348e4..6450a73ad9855 100644 --- a/bin/memos/main.go +++ b/bin/memos/main.go @@ -141,17 +141,20 @@ func init() { } func printGreetings(profile *profile.Profile) { + if profile.IsDev() { + println(""Development mode is enabled"") + println(""DSN: "", profile.DSN) + } fmt.Printf(`--- Server profile version: %s data: %s -dsn: %s addr: %s port: %d mode: %s driver: %s --- -`, profile.Version, profile.Data, profile.DSN, profile.Addr, profile.Port, profile.Mode, profile.Driver) +`, profile.Version, profile.Data, profile.Addr, profile.Port, profile.Mode, profile.Driver) print(greetingBanner) if len(profile.Addr) == 0 {",chore,move dsn output to dev mode 46bd47064074e70d870d85c4b7bdb5c153dd9e1d,2024-01-15 18:40:41,Steven,chore: update favicon,False,"diff --git a/web/index.html b/web/index.html index aea8a3f279ddf..0067458182b10 100644 --- a/web/index.html +++ b/web/index.html @@ -2,10 +2,9 @@ - - - - + + + diff --git a/web/public/favicon-16x16.png b/web/public/favicon-16x16.png deleted file mode 100644 index a9ca10d9ff3eb..0000000000000 Binary files a/web/public/favicon-16x16.png and /dev/null differ diff --git a/web/public/favicon-32x32.png b/web/public/favicon-32x32.png deleted file mode 100644 index 351ebcb568430..0000000000000 Binary files a/web/public/favicon-32x32.png and /dev/null differ diff --git a/web/public/favicon.ico b/web/public/favicon.ico deleted file mode 100644 index 30c78a630326b..0000000000000 Binary files a/web/public/favicon.ico and /dev/null differ diff --git a/web/public/site.webmanifest b/web/public/site.webmanifest index 45dc8a20658bd..3e37c16a11b4f 100644 --- a/web/public/site.webmanifest +++ b/web/public/site.webmanifest @@ -1 +1,11 @@ -{""name"":"""",""short_name"":"""",""icons"":[{""src"":""/android-chrome-192x192.png"",""sizes"":""192x192"",""type"":""image/png""},{""src"":""/android-chrome-512x512.png"",""sizes"":""512x512"",""type"":""image/png""}],""theme_color"":""#ffffff"",""background_color"":""#ffffff"",""display"":""standalone""} \ No newline at end of file +{ + ""name"": ""Memos"", + ""short_name"": """", + ""icons"": [ + { ""src"": ""/android-chrome-192x192.png"", ""sizes"": ""192x192"", ""type"": ""image/png"" }, + { ""src"": ""/android-chrome-512x512.png"", ""sizes"": ""512x512"", ""type"": ""image/png"" } + ], + ""theme_color"": ""#ffffff"", + ""background_color"": ""#ffffff"", + ""display"": ""standalone"" +}",chore,update favicon 4bebbf3e1d3ccad7b430f28410be773b0436ef7f,2022-12-11 16:47:39,Zeng1998,feat: enable paste multiple resources (#729),False,"diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx index fc9bf02222bf0..0054d9f2a6391 100644 --- a/web/src/components/MemoEditor.tsx +++ b/web/src/components/MemoEditor.tsx @@ -151,35 +151,34 @@ const MemoEditor = () => { } }; + const uploadMultiFiles = async (files: FileList) => { + const uploadedResourceList: Resource[] = []; + for (const file of files) { + const resource = await handleUploadResource(file); + if (resource) { + uploadedResourceList.push(resource); + if (editorState.editMemoId) { + await upsertMemoResource(editorState.editMemoId, resource.id); + } + } + } + if (uploadedResourceList.length > 0) { + const resourceList = editorStateService.getState().resourceList; + editorStateService.setResourceList([...resourceList, ...uploadedResourceList]); + } + }; + const handleDropEvent = async (event: React.DragEvent) => { if (event.dataTransfer && event.dataTransfer.files.length > 0) { event.preventDefault(); - const uploadResourceList: Resource[] = []; - for (const file of event.dataTransfer.files) { - const resource = await handleUploadResource(file); - if (resource) { - uploadResourceList.push(resource); - if (editorState.editMemoId) { - await upsertMemoResource(editorState.editMemoId, resource.id); - } - } - } - if (uploadResourceList.length > 0) { - const resourceList = editorStateService.getState().resourceList; - editorStateService.setResourceList([...resourceList, ...uploadResourceList]); - } + await uploadMultiFiles(event.dataTransfer.files); } }; const handlePasteEvent = async (event: React.ClipboardEvent) => { if (event.clipboardData && event.clipboardData.files.length > 0) { event.preventDefault(); - const file = event.clipboardData.files[0]; - const resource = await handleUploadResource(file); - if (resource) { - const resourceList = editorStateService.getState().resourceList; - editorStateService.setResourceList([...resourceList, resource]); - } + await uploadMultiFiles(event.clipboardData.files); } };",feat,enable paste multiple resources (#729) 5eea1339c936ffa1d5325c091f0c30cb5417c388,2022-09-07 21:43:21,winwin2011,fix: upload resouces double time (#204),False,"diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx index 21413c29d644a..4978cb2d9e03a 100644 --- a/web/src/components/ResourcesDialog.tsx +++ b/web/src/components/ResourcesDialog.tsx @@ -70,7 +70,6 @@ const ResourcesDialog: React.FC = (props: Props) => { }); for (const file of inputEl.files) { - await resourceService.upload(file); try { await resourceService.upload(file); } catch (error: any) {",fix,upload resouces double time (#204) 8a3845ff54806699ba18255940920dbbf4e2f06b,2024-04-29 20:27:47,Steven,chore: remove external resource dialog,False,"diff --git a/web/src/components/CreateMemoRelationDialog.tsx b/web/src/components/CreateMemoRelationDialog.tsx index cb65f1d705589..0b2218d1e73ef 100644 --- a/web/src/components/CreateMemoRelationDialog.tsx +++ b/web/src/components/CreateMemoRelationDialog.tsx @@ -145,7 +145,7 @@ const CreateMemoRelationDialog: React.FC = (props: Props) => { ); }; -function showCreateMemoRelationDialog(props: Omit) { +function showCreateMemoRelationDialog(props: Omit) { generateDialog( { className: ""create-memo-relation-dialog"", diff --git a/web/src/components/CreateResourceDialog.tsx b/web/src/components/CreateResourceDialog.tsx index 4e645e0054a18..cd60d27bc28e9 100644 --- a/web/src/components/CreateResourceDialog.tsx +++ b/web/src/components/CreateResourceDialog.tsx @@ -1,4 +1,4 @@ -import { Autocomplete, Button, IconButton, Input, List, ListItem, Option, Select, Typography } from ""@mui/joy""; +import { Button, IconButton, List, ListItem, Typography } from ""@mui/joy""; import React, { useRef, useState } from ""react""; import { toast } from ""react-hot-toast""; import { useResourceStore } from ""@/store/v1""; @@ -7,17 +7,12 @@ import { useTranslate } from ""@/utils/i18n""; import { generateDialog } from ""./Dialog""; import Icon from ""./Icon""; -const fileTypeAutocompleteOptions = [""image/*"", ""text/*"", ""audio/*"", ""video/*"", ""application/*""]; - interface Props extends DialogProps { onCancel?: () => void; onConfirm?: (resourceList: Resource[]) => void; } -type SelectedMode = ""local-file"" | ""external-link""; - interface State { - selectedMode: SelectedMode; uploadingFlag: boolean; } @@ -26,16 +21,8 @@ const CreateResourceDialog: React.FC = (props: Props) => { const { destroy, onCancel, onConfirm } = props; const resourceStore = useResourceStore(); const [state, setState] = useState({ - selectedMode: ""local-file"", uploadingFlag: false, }); - const [resourceCreate, setResourceCreate] = useState( - Resource.fromPartial({ - filename: """", - externalLink: """", - type: """", - }), - ); const [fileList, setFileList] = useState([]); const fileInputRef = useRef(null); @@ -73,44 +60,6 @@ const CreateResourceDialog: React.FC = (props: Props) => { destroy(); }; - const handleSelectedModeChanged = (mode: ""local-file"" | ""external-link"") => { - setState((state) => { - return { - ...state, - selectedMode: mode, - }; - }); - }; - - const handleExternalLinkChanged = (event: React.ChangeEvent) => { - const externalLink = event.target.value; - setResourceCreate((state) => { - return { - ...state, - externalLink, - }; - }); - }; - - const handleFileNameChanged = (event: React.ChangeEvent) => { - const filename = event.target.value; - setResourceCreate((state) => { - return { - ...state, - filename, - }; - }); - }; - - const handleFileTypeChanged = (fileType: string) => { - setResourceCreate((state) => { - return { - ...state, - type: fileType, - }; - }); - }; - const handleFileInputChange = async () => { if (!fileInputRef.current || !fileInputRef.current.files) { return; @@ -124,14 +73,8 @@ const CreateResourceDialog: React.FC = (props: Props) => { }; const allowConfirmAction = () => { - if (state.selectedMode === ""local-file"") { - if (!fileInputRef.current || !fileInputRef.current.files || fileInputRef.current.files.length === 0) { - return false; - } - } else if (state.selectedMode === ""external-link"") { - if (resourceCreate.filename === """" || resourceCreate.externalLink === """" || resourceCreate.type === """") { - return false; - } + if (!fileInputRef.current || !fileInputRef.current.files || fileInputRef.current.files.length === 0) { + return false; } return true; }; @@ -150,30 +93,25 @@ const CreateResourceDialog: React.FC = (props: Props) => { const createdResourceList: Resource[] = []; try { - if (state.selectedMode === ""local-file"") { - if (!fileInputRef.current || !fileInputRef.current.files) { - return; - } - const filesOnInput = Array.from(fileInputRef.current.files); - for (const file of fileList) { - const fileOnInput = filesOnInput.find((fileOnInput) => fileOnInput.name === file.name); - if (!fileOnInput) { - continue; - } - const { name: filename, size, type } = file; - const buffer = new Uint8Array(await file.arrayBuffer()); - const resource = await resourceStore.createResource({ - resource: Resource.fromPartial({ - filename, - size, - type, - content: buffer, - }), - }); - createdResourceList.push(resource); + if (!fileInputRef.current || !fileInputRef.current.files) { + return; + } + const filesOnInput = Array.from(fileInputRef.current.files); + for (const file of fileList) { + const fileOnInput = filesOnInput.find((fileOnInput) => fileOnInput.name === file.name); + if (!fileOnInput) { + continue; } - } else { - const resource = await resourceStore.createResource({ resource: resourceCreate }); + const { name: filename, size, type } = file; + const buffer = new Uint8Array(await file.arrayBuffer()); + const resource = await resourceStore.createResource({ + resource: Resource.fromPartial({ + filename, + size, + type, + content: buffer, + }), + }); createdResourceList.push(resource); } } catch (error: any) { @@ -196,100 +134,47 @@ const CreateResourceDialog: React.FC = (props: Props) => {
- - {t(""resource.create-dialog.upload-method"")} - - - - {state.selectedMode === ""local-file"" && ( - <> -
- - -
- - {fileList.map((file, index) => ( - - {file.name} -
- - -
- - ))} - - - )} - - {state.selectedMode === ""external-link"" && ( - <> - - {t(""resource.create-dialog.external-link.link"")} - - - - {t(""resource.create-dialog.external-link.file-name"")} - - - - {t(""resource.create-dialog.external-link.type"")} - - handleFileTypeChanged(value || """")} - /> - - )} +
+ + +
+ + {fileList.map((file, index) => ( + + {file.name} +
+ + +
+ + ))} +
{children}
",fix,apply customized profile name in mobile header (#2723) 80785de900dbe9e7fc18914734c17be21bc779b7,2024-11-14 19:42:00,johnnyjoy,chore: remove unused script,False,"diff --git a/store/migration/mysql/prod/0.23/00__reactions.sql b/store/migration/mysql/prod/0.23/00__reactions.sql index 7087558740025..13979d15c687f 100644 --- a/store/migration/mysql/prod/0.23/00__reactions.sql +++ b/store/migration/mysql/prod/0.23/00__reactions.sql @@ -10,17 +10,3 @@ UPDATE `reaction` SET `reaction_type` = '👀' WHERE `reaction_type` = 'EYES'; UPDATE `reaction` SET `reaction_type` = '🤔' WHERE `reaction_type` = 'THINKING_FACE'; UPDATE `reaction` SET `reaction_type` = '🤡' WHERE `reaction_type` = 'CLOWN_FACE'; UPDATE `reaction` SET `reaction_type` = '❓' WHERE `reaction_type` = 'QUESTION_MARK'; - -INSERT INTO `system_setting` (`name`, `value`, `description`) -VALUES ( - 'MEMO_RELATED', - '{""contentLengthLimit"":8192,""reactions"":[""👍"",""👎"",""💛"",""🔥"",""👏"",""😂"",""👌"",""🚀"",""👀"",""🤔"",""🤡"",""❓""]}', - '' -) -ON DUPLICATE KEY UPDATE -value = - JSON_SET( - value, - '$.reactions', - JSON_ARRAY('👍', '👎', '💛', '🔥', '👏', '😂', '👌', '🚀', '👀', '🤔', '🤡', '❓') - ); diff --git a/store/migration/postgres/prod/0.23/00__reactions.sql b/store/migration/postgres/prod/0.23/00__reactions.sql index e0d3e97dfdf26..a01e95a292599 100644 --- a/store/migration/postgres/prod/0.23/00__reactions.sql +++ b/store/migration/postgres/prod/0.23/00__reactions.sql @@ -10,17 +10,3 @@ UPDATE ""reaction"" SET ""reaction_type"" = '👀' WHERE ""reaction_type"" = 'EYES'; UPDATE ""reaction"" SET ""reaction_type"" = '🤔' WHERE ""reaction_type"" = 'THINKING_FACE'; UPDATE ""reaction"" SET ""reaction_type"" = '🤡' WHERE ""reaction_type"" = 'CLOWN_FACE'; UPDATE ""reaction"" SET ""reaction_type"" = '❓' WHERE ""reaction_type"" = 'QUESTION_MARK'; - -INSERT INTO ""system_setting"" (""name"", ""value"", ""description"") -VALUES ( - 'MEMO_RELATED', - '{""contentLengthLimit"":8192,""reactions"":[""👍"",""👎"",""💛"",""🔥"",""👏"",""😂"",""👌"",""🚀"",""👀"",""🤔"",""🤡"",""❓""]}', - '' -) -ON CONFLICT(""name"") DO UPDATE -SET ""value"" = - jsonb_set( - ""system_setting"".""value""::jsonb, - '{reactions}', - '[""👍"",""👎"",""💛"",""🔥"",""👏"",""😂"",""👌"",""🚀"",""👀"",""🤔"",""🤡"",""❓""]'::jsonb - ); diff --git a/store/migration/sqlite/prod/0.23/00__reactions.sql b/store/migration/sqlite/prod/0.23/00__reactions.sql index 395b556773002..13979d15c687f 100644 --- a/store/migration/sqlite/prod/0.23/00__reactions.sql +++ b/store/migration/sqlite/prod/0.23/00__reactions.sql @@ -10,17 +10,3 @@ UPDATE `reaction` SET `reaction_type` = '👀' WHERE `reaction_type` = 'EYES'; UPDATE `reaction` SET `reaction_type` = '🤔' WHERE `reaction_type` = 'THINKING_FACE'; UPDATE `reaction` SET `reaction_type` = '🤡' WHERE `reaction_type` = 'CLOWN_FACE'; UPDATE `reaction` SET `reaction_type` = '❓' WHERE `reaction_type` = 'QUESTION_MARK'; - -INSERT INTO `system_setting` (`name`, `value`, `description`) -VALUES ( - 'MEMO_RELATED', - '{""contentLengthLimit"":8192,""reactions"":[""👍"",""👎"",""💛"",""🔥"",""👏"",""😂"",""👌"",""🚀"",""👀"",""🤔"",""🤡"",""❓""]}', - '' -) -ON CONFLICT(name) DO UPDATE -SET value = - json_set( - value, - '$.reactions', - json_array('👍', '👎', '💛', '🔥', '👏', '😂', '👌', '🚀', '👀', '🤔', '🤡', '❓') - );",chore,remove unused script f467f1d9f64f0ed04f3c9f0e9c7b1bb114c6a709,2024-10-11 17:29:14,Steven,chore: update cron package,False,"diff --git a/internal/cron/README.md b/internal/cron/README.md new file mode 100644 index 0000000000000..148a0f1f4c3ab --- /dev/null +++ b/internal/cron/README.md @@ -0,0 +1 @@ +Fork from https://github.com/robfig/cron diff --git a/internal/cron/chain.go b/internal/cron/chain.go new file mode 100644 index 0000000000000..873b9078ec93a --- /dev/null +++ b/internal/cron/chain.go @@ -0,0 +1,95 @@ +package cron + +import ( + ""fmt"" + ""runtime"" + ""sync"" + ""time"" +) + +// JobWrapper decorates the given Job with some behavior. +type JobWrapper func(Job) Job + +// Chain is a sequence of JobWrappers that decorates submitted jobs with +// cross-cutting behaviors like logging or synchronization. +type Chain struct { + wrappers []JobWrapper +} + +// NewChain returns a Chain consisting of the given JobWrappers. +func NewChain(c ...JobWrapper) Chain { + return Chain{c} +} + +// Then decorates the given job with all JobWrappers in the chain. +// +// This: +// +// NewChain(m1, m2, m3).Then(job) +// +// is equivalent to: +// +// m1(m2(m3(job))) +func (c Chain) Then(j Job) Job { + for i := range c.wrappers { + j = c.wrappers[len(c.wrappers)-i-1](j) + } + return j +} + +// Recover panics in wrapped jobs and log them with the provided logger. +func Recover(logger Logger) JobWrapper { + return func(j Job) Job { + return FuncJob(func() { + defer func() { + if r := recover(); r != nil { + const size = 64 << 10 + buf := make([]byte, size) + buf = buf[:runtime.Stack(buf, false)] + err, ok := r.(error) + if !ok { + err = fmt.Errorf(""%v"", r) + } + logger.Error(err, ""panic"", ""stack"", ""...\n""+string(buf)) + } + }() + j.Run() + }) + } +} + +// DelayIfStillRunning serializes jobs, delaying subsequent runs until the +// previous one is complete. Jobs running after a delay of more than a minute +// have the delay logged at Info. +func DelayIfStillRunning(logger Logger) JobWrapper { + return func(j Job) Job { + var mu sync.Mutex + return FuncJob(func() { + start := time.Now() + mu.Lock() + defer mu.Unlock() + if dur := time.Since(start); dur > time.Minute { + logger.Info(""delay"", ""duration"", dur) + } + j.Run() + }) + } +} + +// SkipIfStillRunning skips an invocation of the Job if a previous invocation is +// still running. It logs skips to the given logger at Info level. +func SkipIfStillRunning(logger Logger) JobWrapper { + return func(j Job) Job { + var ch = make(chan struct{}, 1) + ch <- struct{}{} + return FuncJob(func() { + select { + case v := <-ch: + defer func() { ch <- v }() + j.Run() + default: + logger.Info(""skip"") + } + }) + } +} diff --git a/internal/cron/chain_test.go b/internal/cron/chain_test.go new file mode 100644 index 0000000000000..a0433b3106c36 --- /dev/null +++ b/internal/cron/chain_test.go @@ -0,0 +1,242 @@ +package cron + +import ( + ""io"" + ""log"" + ""reflect"" + ""sync"" + ""testing"" + ""time"" +) + +func appendingJob(slice *[]int, value int) Job { + var m sync.Mutex + return FuncJob(func() { + m.Lock() + *slice = append(*slice, value) + m.Unlock() + }) +} + +func appendingWrapper(slice *[]int, value int) JobWrapper { + return func(j Job) Job { + return FuncJob(func() { + appendingJob(slice, value).Run() + j.Run() + }) + } +} + +func TestChain(t *testing.T) { + var nums []int + var ( + append1 = appendingWrapper(&nums, 1) + append2 = appendingWrapper(&nums, 2) + append3 = appendingWrapper(&nums, 3) + append4 = appendingJob(&nums, 4) + ) + NewChain(append1, append2, append3).Then(append4).Run() + if !reflect.DeepEqual(nums, []int{1, 2, 3, 4}) { + t.Error(""unexpected order of calls:"", nums) + } +} + +func TestChainRecover(t *testing.T) { + panickingJob := FuncJob(func() { + panic(""panickingJob panics"") + }) + + t.Run(""panic exits job by default"", func(t *testing.T) { + defer func() { + if err := recover(); err == nil { + t.Errorf(""panic expected, but none received"") + } + }() + NewChain().Then(panickingJob). + Run() + }) + + t.Run(""Recovering JobWrapper recovers"", func(t *testing.T) { + NewChain(Recover(PrintfLogger(log.New(io.Discard, """", 0)))). + Then(panickingJob). + Run() + }) + + t.Run(""composed with the *IfStillRunning wrappers"", func(t *testing.T) { + NewChain(Recover(PrintfLogger(log.New(io.Discard, """", 0)))). + Then(panickingJob). + Run() + }) +} + +type countJob struct { + m sync.Mutex + started int + done int + delay time.Duration +} + +func (j *countJob) Run() { + j.m.Lock() + j.started++ + j.m.Unlock() + time.Sleep(j.delay) + j.m.Lock() + j.done++ + j.m.Unlock() +} + +func (j *countJob) Started() int { + defer j.m.Unlock() + j.m.Lock() + return j.started +} + +func (j *countJob) Done() int { + defer j.m.Unlock() + j.m.Lock() + return j.done +} + +func TestChainDelayIfStillRunning(t *testing.T) { + + t.Run(""runs immediately"", func(t *testing.T) { + var j countJob + wrappedJob := NewChain(DelayIfStillRunning(DiscardLogger)).Then(&j) + go wrappedJob.Run() + time.Sleep(2 * time.Millisecond) // Give the job 2ms to complete. + if c := j.Done(); c != 1 { + t.Errorf(""expected job run once, immediately, got %d"", c) + } + }) + + t.Run(""second run immediate if first done"", func(t *testing.T) { + var j countJob + wrappedJob := NewChain(DelayIfStillRunning(DiscardLogger)).Then(&j) + go func() { + go wrappedJob.Run() + time.Sleep(time.Millisecond) + go wrappedJob.Run() + }() + time.Sleep(3 * time.Millisecond) // Give both jobs 3ms to complete. + if c := j.Done(); c != 2 { + t.Errorf(""expected job run twice, immediately, got %d"", c) + } + }) + + t.Run(""second run delayed if first not done"", func(t *testing.T) { + var j countJob + j.delay = 10 * time.Millisecond + wrappedJob := NewChain(DelayIfStillRunning(DiscardLogger)).Then(&j) + go func() { + go wrappedJob.Run() + time.Sleep(time.Millisecond) + go wrappedJob.Run() + }() + + // After 5ms, the first job is still in progress, and the second job was + // run but should be waiting for it to finish. + time.Sleep(5 * time.Millisecond) + started, done := j.Started(), j.Done() + if started != 1 || done != 0 { + t.Error(""expected first job started, but not finished, got"", started, done) + } + + // Verify that the second job completes. + time.Sleep(25 * time.Millisecond) + started, done = j.Started(), j.Done() + if started != 2 || done != 2 { + t.Error(""expected both jobs done, got"", started, done) + } + }) + +} + +func TestChainSkipIfStillRunning(t *testing.T) { + + t.Run(""runs immediately"", func(t *testing.T) { + var j countJob + wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) + go wrappedJob.Run() + time.Sleep(2 * time.Millisecond) // Give the job 2ms to complete. + if c := j.Done(); c != 1 { + t.Errorf(""expected job run once, immediately, got %d"", c) + } + }) + + t.Run(""second run immediate if first done"", func(t *testing.T) { + var j countJob + wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) + go func() { + go wrappedJob.Run() + time.Sleep(time.Millisecond) + go wrappedJob.Run() + }() + time.Sleep(3 * time.Millisecond) // Give both jobs 3ms to complete. + if c := j.Done(); c != 2 { + t.Errorf(""expected job run twice, immediately, got %d"", c) + } + }) + + t.Run(""second run skipped if first not done"", func(t *testing.T) { + var j countJob + j.delay = 10 * time.Millisecond + wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) + go func() { + go wrappedJob.Run() + time.Sleep(time.Millisecond) + go wrappedJob.Run() + }() + + // After 5ms, the first job is still in progress, and the second job was + // aleady skipped. + time.Sleep(5 * time.Millisecond) + started, done := j.Started(), j.Done() + if started != 1 || done != 0 { + t.Error(""expected first job started, but not finished, got"", started, done) + } + + // Verify that the first job completes and second does not run. + time.Sleep(25 * time.Millisecond) + started, done = j.Started(), j.Done() + if started != 1 || done != 1 { + t.Error(""expected second job skipped, got"", started, done) + } + }) + + t.Run(""skip 10 jobs on rapid fire"", func(t *testing.T) { + var j countJob + j.delay = 10 * time.Millisecond + wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) + for i := 0; i < 11; i++ { + go wrappedJob.Run() + } + time.Sleep(200 * time.Millisecond) + done := j.Done() + if done != 1 { + t.Error(""expected 1 jobs executed, 10 jobs dropped, got"", done) + } + }) + + t.Run(""different jobs independent"", func(t *testing.T) { + var j1, j2 countJob + j1.delay = 10 * time.Millisecond + j2.delay = 10 * time.Millisecond + chain := NewChain(SkipIfStillRunning(DiscardLogger)) + wrappedJob1 := chain.Then(&j1) + wrappedJob2 := chain.Then(&j2) + for i := 0; i < 11; i++ { + go wrappedJob1.Run() + go wrappedJob2.Run() + } + time.Sleep(100 * time.Millisecond) + var ( + done1 = j1.Done() + done2 = j2.Done() + ) + if done1 != 1 || done2 != 1 { + t.Error(""expected both jobs executed once, got"", done1, ""and"", done2) + } + }) + +} diff --git a/internal/cron/constantdelay.go b/internal/cron/constantdelay.go new file mode 100644 index 0000000000000..cd6e7b1be91a6 --- /dev/null +++ b/internal/cron/constantdelay.go @@ -0,0 +1,27 @@ +package cron + +import ""time"" + +// ConstantDelaySchedule represents a simple recurring duty cycle, e.g. ""Every 5 minutes"". +// It does not support jobs more frequent than once a second. +type ConstantDelaySchedule struct { + Delay time.Duration +} + +// Every returns a crontab Schedule that activates once every duration. +// Delays of less than a second are not supported (will round up to 1 second). +// Any fields less than a Second are truncated. +func Every(duration time.Duration) ConstantDelaySchedule { + if duration < time.Second { + duration = time.Second + } + return ConstantDelaySchedule{ + Delay: duration - time.Duration(duration.Nanoseconds())%time.Second, + } +} + +// Next returns the next time this should be run. +// This rounds so that the next activation time will be on the second. +func (schedule ConstantDelaySchedule) Next(t time.Time) time.Time { + return t.Add(schedule.Delay - time.Duration(t.Nanosecond())*time.Nanosecond) +} diff --git a/internal/cron/constantdelay_test.go b/internal/cron/constantdelay_test.go new file mode 100644 index 0000000000000..f43a58ad260ec --- /dev/null +++ b/internal/cron/constantdelay_test.go @@ -0,0 +1,54 @@ +package cron + +import ( + ""testing"" + ""time"" +) + +func TestConstantDelayNext(t *testing.T) { + tests := []struct { + time string + delay time.Duration + expected string + }{ + // Simple cases + {""Mon Jul 9 14:45 2012"", 15*time.Minute + 50*time.Nanosecond, ""Mon Jul 9 15:00 2012""}, + {""Mon Jul 9 14:59 2012"", 15 * time.Minute, ""Mon Jul 9 15:14 2012""}, + {""Mon Jul 9 14:59:59 2012"", 15 * time.Minute, ""Mon Jul 9 15:14:59 2012""}, + + // Wrap around hours + {""Mon Jul 9 15:45 2012"", 35 * time.Minute, ""Mon Jul 9 16:20 2012""}, + + // Wrap around days + {""Mon Jul 9 23:46 2012"", 14 * time.Minute, ""Tue Jul 10 00:00 2012""}, + {""Mon Jul 9 23:45 2012"", 35 * time.Minute, ""Tue Jul 10 00:20 2012""}, + {""Mon Jul 9 23:35:51 2012"", 44*time.Minute + 24*time.Second, ""Tue Jul 10 00:20:15 2012""}, + {""Mon Jul 9 23:35:51 2012"", 25*time.Hour + 44*time.Minute + 24*time.Second, ""Thu Jul 11 01:20:15 2012""}, + + // Wrap around months + {""Mon Jul 9 23:35 2012"", 91*24*time.Hour + 25*time.Minute, ""Thu Oct 9 00:00 2012""}, + + // Wrap around minute, hour, day, month, and year + {""Mon Dec 31 23:59:45 2012"", 15 * time.Second, ""Tue Jan 1 00:00:00 2013""}, + + // Round to nearest second on the delay + {""Mon Jul 9 14:45 2012"", 15*time.Minute + 50*time.Nanosecond, ""Mon Jul 9 15:00 2012""}, + + // Round up to 1 second if the duration is less. + {""Mon Jul 9 14:45:00 2012"", 15 * time.Millisecond, ""Mon Jul 9 14:45:01 2012""}, + + // Round to nearest second when calculating the next time. + {""Mon Jul 9 14:45:00.005 2012"", 15 * time.Minute, ""Mon Jul 9 15:00 2012""}, + + // Round to nearest second for both. + {""Mon Jul 9 14:45:00.005 2012"", 15*time.Minute + 50*time.Nanosecond, ""Mon Jul 9 15:00 2012""}, + } + + for _, c := range tests { + actual := Every(c.delay).Next(getTime(c.time)) + expected := getTime(c.expected) + if actual != expected { + t.Errorf(""%s, \""%s\"": (expected) %v != %v (actual)"", c.time, c.delay, expected, actual) + } + } +} diff --git a/internal/cron/cron.go b/internal/cron/cron.go index df26c48aeb5c7..c7e9176658986 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -1,179 +1,355 @@ -// Package cron implements a crontab-like service to execute and schedule repeative tasks/jobs. package cron -// Example: -// -// c := cron.New() -// c.MustAdd(""dailyReport"", ""0 0 * * *"", func() { ... }) -// c.Start() - import ( + ""context"" + ""sort"" ""sync"" ""time"" - - ""github.com/pkg/errors"" ) -type job struct { - schedule *Schedule - run func() +// Cron keeps track of any number of entries, invoking the associated func as +// specified by the schedule. It may be started, stopped, and the entries may +// be inspected while running. +type Cron struct { + entries []*Entry + chain Chain + stop chan struct{} + add chan *Entry + remove chan EntryID + snapshot chan chan []Entry + running bool + logger Logger + runningMu sync.Mutex + location *time.Location + parser ScheduleParser + nextID EntryID + jobWaiter sync.WaitGroup } -// Cron is a crontab-like struct for tasks/jobs scheduling. -type Cron struct { - sync.RWMutex +// ScheduleParser is an interface for schedule spec parsers that return a Schedule +type ScheduleParser interface { + Parse(spec string) (Schedule, error) +} - interval time.Duration - timezone *time.Location - ticker *time.Ticker - jobs map[string]*job +// Job is an interface for submitted cron jobs. +type Job interface { + Run() } -// New create a new Cron struct with default tick interval of 1 minute -// and timezone in UTC. -// -// You can change the default tick interval with Cron.SetInterval(). -// You can change the default timezone with Cron.SetTimezone(). -func New() *Cron { - return &Cron{ - interval: 1 * time.Minute, - timezone: time.UTC, - jobs: map[string]*job{}, - } +// Schedule describes a job's duty cycle. +type Schedule interface { + // Next returns the next activation time, later than the given time. + // Next is invoked initially, and then each time the job is run. + Next(time.Time) time.Time } -// SetInterval changes the current cron tick interval -// (it usually should be >= 1 minute). -func (c *Cron) SetInterval(d time.Duration) { - // update interval - c.Lock() - wasStarted := c.ticker != nil - c.interval = d - c.Unlock() +// EntryID identifies an entry within a Cron instance +type EntryID int - // restart the ticker - if wasStarted { - c.Start() - } -} +// Entry consists of a schedule and the func to execute on that schedule. +type Entry struct { + // ID is the cron-assigned ID of this entry, which may be used to look up a + // snapshot or remove it. + ID EntryID + + // Schedule on which this job should be run. + Schedule Schedule + + // Next time the job will run, or the zero time if Cron has not been + // started or this entry's schedule is unsatisfiable + Next time.Time + + // Prev is the last time this job was run, or the zero time if never. + Prev time.Time -// SetTimezone changes the current cron tick timezone. -func (c *Cron) SetTimezone(l *time.Location) { - c.Lock() - defer c.Unlock() + // WrappedJob is the thing to run when the Schedule is activated. + WrappedJob Job - c.timezone = l + // Job is the thing that was submitted to cron. + // It is kept around so that user code that needs to get at the job later, + // e.g. via Entries() can do so. + Job Job } -// MustAdd is similar to Add() but panic on failure. -func (c *Cron) MustAdd(jobID string, cronExpr string, run func()) { - if err := c.Add(jobID, cronExpr, run); err != nil { - panic(err) +// Valid returns true if this is not the zero entry. +func (e Entry) Valid() bool { return e.ID != 0 } + +// byTime is a wrapper for sorting the entry array by time +// (with zero time at the end). +type byTime []*Entry + +func (s byTime) Len() int { return len(s) } +func (s byTime) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s byTime) Less(i, j int) bool { + // Two zero times should return false. + // Otherwise, zero is ""greater"" than any other time. + // (To sort it at the end of the list.) + if s[i].Next.IsZero() { + return false } + if s[j].Next.IsZero() { + return true + } + return s[i].Next.Before(s[j].Next) } -// Add registers a single cron job. +// New returns a new Cron job runner, modified by the given options. +// +// Available Settings +// +// Time Zone +// Description: The time zone in which schedules are interpreted +// Default: time.Local +// +// Parser +// Description: Parser converts cron spec strings into cron.Schedules. +// Default: Accepts this spec: https://en.wikipedia.org/wiki/Cron // -// If there is already a job with the provided id, then the old job -// will be replaced with the new one. +// Chain +// Description: Wrap submitted jobs to customize behavior. +// Default: A chain that recovers panics and logs them to stderr. // -// cronExpr is a regular cron expression, eg. ""0 */3 * * *"" (aka. at minute 0 past every 3rd hour). -// Check cron.NewSchedule() for the supported tokens. -func (c *Cron) Add(jobID string, cronExpr string, run func()) error { - if run == nil { - return errors.New(""failed to add new cron job: run must be non-nil function"") +// See ""cron.With*"" to modify the default behavior. +func New(opts ...Option) *Cron { + c := &Cron{ + entries: nil, + chain: NewChain(), + add: make(chan *Entry), + stop: make(chan struct{}), + snapshot: make(chan chan []Entry), + remove: make(chan EntryID), + running: false, + runningMu: sync.Mutex{}, + logger: DefaultLogger, + location: time.Local, + parser: standardParser, } + for _, opt := range opts { + opt(c) + } + return c +} + +// FuncJob is a wrapper that turns a func() into a cron.Job +type FuncJob func() - c.Lock() - defer c.Unlock() +func (f FuncJob) Run() { f() } - schedule, err := NewSchedule(cronExpr) +// AddFunc adds a func to the Cron to be run on the given schedule. +// The spec is parsed using the time zone of this Cron instance as the default. +// An opaque ID is returned that can be used to later remove it. +func (c *Cron) AddFunc(spec string, cmd func()) (EntryID, error) { + return c.AddJob(spec, FuncJob(cmd)) +} + +// AddJob adds a Job to the Cron to be run on the given schedule. +// The spec is parsed using the time zone of this Cron instance as the default. +// An opaque ID is returned that can be used to later remove it. +func (c *Cron) AddJob(spec string, cmd Job) (EntryID, error) { + schedule, err := c.parser.Parse(spec) if err != nil { - return errors.Wrap(err, ""failed to add new cron job"") + return 0, err } + return c.Schedule(schedule, cmd), nil +} - c.jobs[jobID] = &job{ - schedule: schedule, - run: run, +// Schedule adds a Job to the Cron to be run on the given schedule. +// The job is wrapped with the configured Chain. +func (c *Cron) Schedule(schedule Schedule, cmd Job) EntryID { + c.runningMu.Lock() + defer c.runningMu.Unlock() + c.nextID++ + entry := &Entry{ + ID: c.nextID, + Schedule: schedule, + WrappedJob: c.chain.Then(cmd), + Job: cmd, } - - return nil + if !c.running { + c.entries = append(c.entries, entry) + } else { + c.add <- entry + } + return entry.ID } -// Remove removes a single cron job by its id. -func (c *Cron) Remove(jobID string) { - c.Lock() - defer c.Unlock() +// Entries returns a snapshot of the cron entries. +func (c *Cron) Entries() []Entry { + c.runningMu.Lock() + defer c.runningMu.Unlock() + if c.running { + replyChan := make(chan []Entry, 1) + c.snapshot <- replyChan + return <-replyChan + } + return c.entrySnapshot() +} - delete(c.jobs, jobID) +// Location gets the time zone location +func (c *Cron) Location() *time.Location { + return c.location } -// RemoveAll removes all registered cron jobs. -func (c *Cron) RemoveAll() { - c.Lock() - defer c.Unlock() +// Entry returns a snapshot of the given entry, or nil if it couldn't be found. +func (c *Cron) Entry(id EntryID) Entry { + for _, entry := range c.Entries() { + if id == entry.ID { + return entry + } + } + return Entry{} +} - c.jobs = map[string]*job{} +// Remove an entry from being run in the future. +func (c *Cron) Remove(id EntryID) { + c.runningMu.Lock() + defer c.runningMu.Unlock() + if c.running { + c.remove <- id + } else { + c.removeEntry(id) + } } -// Total returns the current total number of registered cron jobs. -func (c *Cron) Total() int { - c.RLock() - defer c.RUnlock() +// Start the cron scheduler in its own goroutine, or no-op if already started. +func (c *Cron) Start() { + c.runningMu.Lock() + defer c.runningMu.Unlock() + if c.running { + return + } + c.running = true + go c.run() +} - return len(c.jobs) +// Run the cron scheduler, or no-op if already running. +func (c *Cron) Run() { + c.runningMu.Lock() + if c.running { + c.runningMu.Unlock() + return + } + c.running = true + c.runningMu.Unlock() + c.run() } -// Stop stops the current cron ticker (if not already). -// -// You can resume the ticker by calling Start(). -func (c *Cron) Stop() { - c.Lock() - defer c.Unlock() +// run the scheduler.. this is private just due to the need to synchronize +// access to the 'running' state variable. +func (c *Cron) run() { + c.logger.Info(""start"") - if c.ticker == nil { - return // already stopped + // Figure out the next activation times for each entry. + now := c.now() + for _, entry := range c.entries { + entry.Next = entry.Schedule.Next(now) + c.logger.Info(""schedule"", ""now"", now, ""entry"", entry.ID, ""next"", entry.Next) } - c.ticker.Stop() - c.ticker = nil -} - -// Start starts the cron ticker. -// -// Calling Start() on already started cron will restart the ticker. -func (c *Cron) Start() { - c.Stop() + for { + // Determine the next entry to run. + sort.Sort(byTime(c.entries)) + + var timer *time.Timer + if len(c.entries) == 0 || c.entries[0].Next.IsZero() { + // If there are no entries yet, just sleep - it still handles new entries + // and stop requests. + timer = time.NewTimer(100000 * time.Hour) + } else { + timer = time.NewTimer(c.entries[0].Next.Sub(now)) + } - c.Lock() - c.ticker = time.NewTicker(c.interval) - c.Unlock() + for { + select { + case now = <-timer.C: + now = now.In(c.location) + c.logger.Info(""wake"", ""now"", now) + + // Run every entry whose next time was less than now + for _, e := range c.entries { + if e.Next.After(now) || e.Next.IsZero() { + break + } + c.startJob(e.WrappedJob) + e.Prev = e.Next + e.Next = e.Schedule.Next(now) + c.logger.Info(""run"", ""now"", now, ""entry"", e.ID, ""next"", e.Next) + } + + case newEntry := <-c.add: + timer.Stop() + now = c.now() + newEntry.Next = newEntry.Schedule.Next(now) + c.entries = append(c.entries, newEntry) + c.logger.Info(""added"", ""now"", now, ""entry"", newEntry.ID, ""next"", newEntry.Next) + + case replyChan := <-c.snapshot: + replyChan <- c.entrySnapshot() + continue + + case <-c.stop: + timer.Stop() + c.logger.Info(""stop"") + return + + case id := <-c.remove: + timer.Stop() + now = c.now() + c.removeEntry(id) + c.logger.Info(""removed"", ""entry"", id) + } + + break + } + } +} +// startJob runs the given job in a new goroutine. +func (c *Cron) startJob(j Job) { + c.jobWaiter.Add(1) go func() { - for t := range c.ticker.C { - c.runDue(t) - } + defer c.jobWaiter.Done() + j.Run() }() } -// HasStarted checks whether the current Cron ticker has been started. -func (c *Cron) HasStarted() bool { - c.RLock() - defer c.RUnlock() - - return c.ticker != nil +// now returns current time in c location +func (c *Cron) now() time.Time { + return time.Now().In(c.location) } -// runDue runs all registered jobs that are scheduled for the provided time. -func (c *Cron) runDue(t time.Time) { - c.RLock() - defer c.RUnlock() +// Stop stops the cron scheduler if it is running; otherwise it does nothing. +// A context is returned so the caller can wait for running jobs to complete. +func (c *Cron) Stop() context.Context { + c.runningMu.Lock() + defer c.runningMu.Unlock() + if c.running { + c.stop <- struct{}{} + c.running = false + } + ctx, cancel := context.WithCancel(context.Background()) + go func() { + c.jobWaiter.Wait() + cancel() + }() + return ctx +} - moment := NewMoment(t.In(c.timezone)) +// entrySnapshot returns a copy of the current cron entry list. +func (c *Cron) entrySnapshot() []Entry { + var entries = make([]Entry, len(c.entries)) + for i, e := range c.entries { + entries[i] = *e + } + return entries +} - for _, j := range c.jobs { - if j.schedule.IsDue(moment) { - go j.run() +func (c *Cron) removeEntry(id EntryID) { + var entries []*Entry + for _, e := range c.entries { + if e.ID != id { + entries = append(entries, e) } } + c.entries = entries } diff --git a/internal/cron/cron_test.go b/internal/cron/cron_test.go index 430a70bff999e..36f06bf7389a0 100644 --- a/internal/cron/cron_test.go +++ b/internal/cron/cron_test.go @@ -1,249 +1,702 @@ package cron import ( - ""encoding/json"" + ""bytes"" + ""fmt"" + ""log"" + ""strings"" + ""sync"" + ""sync/atomic"" ""testing"" ""time"" - - ""github.com/stretchr/testify/require"" ) -func TestCronNew(t *testing.T) { - c := New() +// Many tests schedule a job for every second, and then wait at most a second +// for it to run. This amount is just slightly larger than 1 second to +// compensate for a few milliseconds of runtime. +const OneSecond = 1*time.Second + 50*time.Millisecond - expectedInterval := 1 * time.Minute - if c.interval != expectedInterval { - t.Fatalf(""Expected default interval %v, got %v"", expectedInterval, c.interval) - } +type syncWriter struct { + wr bytes.Buffer + m sync.Mutex +} - expectedTimezone := time.UTC - if c.timezone.String() != expectedTimezone.String() { - t.Fatalf(""Expected default timezone %v, got %v"", expectedTimezone, c.timezone) - } +func (sw *syncWriter) Write(data []byte) (n int, err error) { + sw.m.Lock() + n, err = sw.wr.Write(data) + sw.m.Unlock() + return +} - if len(c.jobs) != 0 { - t.Fatalf(""Expected no jobs by default, got \n%v"", c.jobs) - } +func (sw *syncWriter) String() string { + sw.m.Lock() + defer sw.m.Unlock() + return sw.wr.String() +} - if c.ticker != nil { - t.Fatal(""Expected the ticker NOT to be initialized"") +func newBufLogger(sw *syncWriter) Logger { + return PrintfLogger(log.New(sw, """", log.LstdFlags)) +} + +func TestFuncPanicRecovery(t *testing.T) { + var buf syncWriter + cron := New(WithParser(secondParser), + WithChain(Recover(newBufLogger(&buf)))) + cron.Start() + defer cron.Stop() + cron.AddFunc(""* * * * * ?"", func() { + panic(""YOLO"") + }) + + select { + case <-time.After(OneSecond): + if !strings.Contains(buf.String(), ""YOLO"") { + t.Error(""expected a panic to be logged, got none"") + } + return } } -func TestCronSetInterval(t *testing.T) { - c := New() +type DummyJob struct{} - interval := 2 * time.Minute +func (d DummyJob) Run() { + panic(""YOLO"") +} - c.SetInterval(interval) +func TestJobPanicRecovery(t *testing.T) { + var job DummyJob - if c.interval != interval { - t.Fatalf(""Expected interval %v, got %v"", interval, c.interval) + var buf syncWriter + cron := New(WithParser(secondParser), + WithChain(Recover(newBufLogger(&buf)))) + cron.Start() + defer cron.Stop() + cron.AddJob(""* * * * * ?"", job) + + select { + case <-time.After(OneSecond): + if !strings.Contains(buf.String(), ""YOLO"") { + t.Error(""expected a panic to be logged, got none"") + } + return } } -func TestCronSetTimezone(t *testing.T) { - c := New() +// Start and stop cron with no entries. +func TestNoEntries(t *testing.T) { + cron := newWithSeconds() + cron.Start() - timezone, _ := time.LoadLocation(""Asia/Tokyo"") + select { + case <-time.After(OneSecond): + t.Fatal(""expected cron will be stopped immediately"") + case <-stop(cron): + } +} - c.SetTimezone(timezone) +// Start, stop, then add an entry. Verify entry doesn't run. +func TestStopCausesJobsToNotRun(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) + + cron := newWithSeconds() + cron.Start() + cron.Stop() + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + + select { + case <-time.After(OneSecond): + // No job ran! + case <-wait(wg): + t.Fatal(""expected stopped cron does not run any job"") + } +} - if c.timezone.String() != timezone.String() { - t.Fatalf(""Expected timezone %v, got %v"", timezone, c.timezone) +// Add a job, start cron, expect it runs. +func TestAddBeforeRunning(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) + + cron := newWithSeconds() + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + cron.Start() + defer cron.Stop() + + // Give cron 2 seconds to run our job (which is always activated). + select { + case <-time.After(OneSecond): + t.Fatal(""expected job runs"") + case <-wait(wg): } } -func TestCronAddAndRemove(t *testing.T) { - c := New() +// Start cron, add a job, expect it runs. +func TestAddWhileRunning(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) - if err := c.Add(""test0"", ""* * * * *"", nil); err == nil { - t.Fatal(""Expected nil function error"") + cron := newWithSeconds() + cron.Start() + defer cron.Stop() + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + + select { + case <-time.After(OneSecond): + t.Fatal(""expected job runs"") + case <-wait(wg): } +} - if err := c.Add(""test1"", ""invalid"", func() {}); err == nil { - t.Fatal(""Expected invalid cron expression error"") +// Test for #34. Adding a job after calling start results in multiple job invocations +func TestAddWhileRunningWithDelay(t *testing.T) { + cron := newWithSeconds() + cron.Start() + defer cron.Stop() + time.Sleep(5 * time.Second) + var calls int64 + cron.AddFunc(""* * * * * *"", func() { atomic.AddInt64(&calls, 1) }) + + <-time.After(OneSecond) + if atomic.LoadInt64(&calls) != 1 { + t.Errorf(""called %d times, expected 1\n"", calls) } +} - if err := c.Add(""test2"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) +// Add a job, remove a job, start cron, expect nothing runs. +func TestRemoveBeforeRunning(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) + + cron := newWithSeconds() + id, _ := cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + cron.Remove(id) + cron.Start() + defer cron.Stop() + + select { + case <-time.After(OneSecond): + // Success, shouldn't run + case <-wait(wg): + t.FailNow() } +} - if err := c.Add(""test3"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) +// Start cron, add a job, remove it, expect it doesn't run. +func TestRemoveWhileRunning(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) + + cron := newWithSeconds() + cron.Start() + defer cron.Stop() + id, _ := cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + cron.Remove(id) + + select { + case <-time.After(OneSecond): + case <-wait(wg): + t.FailNow() } +} + +// Test timing with Entries. +func TestSnapshotEntries(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) - if err := c.Add(""test4"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) + cron := New() + cron.AddFunc(""@every 2s"", func() { wg.Done() }) + cron.Start() + defer cron.Stop() + + // Cron should fire in 2 seconds. After 1 second, call Entries. + select { + case <-time.After(OneSecond): + cron.Entries() } - // overwrite test2 - if err := c.Add(""test2"", ""1 2 3 4 5"", func() {}); err != nil { - t.Fatal(err) + // Even though Entries was called, the cron should fire at the 2 second mark. + select { + case <-time.After(OneSecond): + t.Error(""expected job runs at 2 second mark"") + case <-wait(wg): } +} - if err := c.Add(""test5"", ""1 2 3 4 5"", func() {}); err != nil { - t.Fatal(err) +// Test that the entries are correctly sorted. +// Add a bunch of long-in-the-future entries, and an immediate entry, and ensure +// that the immediate entry runs immediately. +// Also: Test that multiple jobs run in the same instant. +func TestMultipleEntries(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(2) + + cron := newWithSeconds() + cron.AddFunc(""0 0 0 1 1 ?"", func() {}) + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + id1, _ := cron.AddFunc(""* * * * * ?"", func() { t.Fatal() }) + id2, _ := cron.AddFunc(""* * * * * ?"", func() { t.Fatal() }) + cron.AddFunc(""0 0 0 31 12 ?"", func() {}) + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + + cron.Remove(id1) + cron.Start() + cron.Remove(id2) + defer cron.Stop() + + select { + case <-time.After(OneSecond): + t.Error(""expected job run in proper order"") + case <-wait(wg): } +} - // mock job deletion - c.Remove(""test4"") +// Test running the same job twice. +func TestRunningJobTwice(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(2) - // try to remove non-existing (should be no-op) - c.Remove(""missing"") + cron := newWithSeconds() + cron.AddFunc(""0 0 0 1 1 ?"", func() {}) + cron.AddFunc(""0 0 0 31 12 ?"", func() {}) + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) - // check job keys - { - expectedKeys := []string{""test3"", ""test2"", ""test5""} + cron.Start() + defer cron.Stop() - if v := len(c.jobs); v != len(expectedKeys) { - t.Fatalf(""Expected %d jobs, got %d"", len(expectedKeys), v) - } + select { + case <-time.After(2 * OneSecond): + t.Error(""expected job fires 2 times"") + case <-wait(wg): + } +} - for _, k := range expectedKeys { - if c.jobs[k] == nil { - t.Fatalf(""Expected job with key %s, got nil"", k) - } - } +func TestRunningMultipleSchedules(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(2) + + cron := newWithSeconds() + cron.AddFunc(""0 0 0 1 1 ?"", func() {}) + cron.AddFunc(""0 0 0 31 12 ?"", func() {}) + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + cron.Schedule(Every(time.Minute), FuncJob(func() {})) + cron.Schedule(Every(time.Second), FuncJob(func() { wg.Done() })) + cron.Schedule(Every(time.Hour), FuncJob(func() {})) + + cron.Start() + defer cron.Stop() + + select { + case <-time.After(2 * OneSecond): + t.Error(""expected job fires 2 times"") + case <-wait(wg): } +} - // check the jobs schedule - { - expectedSchedules := map[string]string{ - ""test2"": `{""minutes"":{""1"":{}},""hours"":{""2"":{}},""days"":{""3"":{}},""months"":{""4"":{}},""daysOfWeek"":{""5"":{}}}`, - ""test3"": `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - ""test5"": `{""minutes"":{""1"":{}},""hours"":{""2"":{}},""days"":{""3"":{}},""months"":{""4"":{}},""daysOfWeek"":{""5"":{}}}`, - } - for k, v := range expectedSchedules { - raw, err := json.Marshal(c.jobs[k].schedule) - if err != nil { - t.Fatal(err) - } - - if string(raw) != v { - t.Fatalf(""Expected %q schedule \n%s, \ngot \n%s"", k, v, raw) - } - } +// Test that the cron is run in the local time zone (as opposed to UTC). +func TestLocalTimezone(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(2) + + now := time.Now() + // FIX: Issue #205 + // This calculation doesn't work in seconds 58 or 59. + // Take the easy way out and sleep. + if now.Second() >= 58 { + time.Sleep(2 * time.Second) + now = time.Now() + } + spec := fmt.Sprintf(""%d,%d %d %d %d %d ?"", + now.Second()+1, now.Second()+2, now.Minute(), now.Hour(), now.Day(), now.Month()) + + cron := newWithSeconds() + cron.AddFunc(spec, func() { wg.Done() }) + cron.Start() + defer cron.Stop() + + select { + case <-time.After(OneSecond * 2): + t.Error(""expected job fires 2 times"") + case <-wait(wg): } } -func TestCronMustAdd(t *testing.T) { - c := New() +// Test that the cron is run in the given time zone (as opposed to local). +func TestNonLocalTimezone(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(2) - defer func() { - if r := recover(); r == nil { - t.Errorf(""test1 didn't panic"") - } - }() + loc, err := time.LoadLocation(""Atlantic/Cape_Verde"") + if err != nil { + fmt.Printf(""Failed to load time zone Atlantic/Cape_Verde: %+v"", err) + t.Fail() + } - c.MustAdd(""test1"", ""* * * * *"", nil) + now := time.Now().In(loc) + // FIX: Issue #205 + // This calculation doesn't work in seconds 58 or 59. + // Take the easy way out and sleep. + if now.Second() >= 58 { + time.Sleep(2 * time.Second) + now = time.Now().In(loc) + } + spec := fmt.Sprintf(""%d,%d %d %d %d %d ?"", + now.Second()+1, now.Second()+2, now.Minute(), now.Hour(), now.Day(), now.Month()) + + cron := New(WithLocation(loc), WithParser(secondParser)) + cron.AddFunc(spec, func() { wg.Done() }) + cron.Start() + defer cron.Stop() + + select { + case <-time.After(OneSecond * 2): + t.Error(""expected job fires 2 times"") + case <-wait(wg): + } +} - c.MustAdd(""test2"", ""* * * * *"", func() {}) +// Test that calling stop before start silently returns without +// blocking the stop channel. +func TestStopWithoutStart(t *testing.T) { + cron := New() + cron.Stop() +} - if _, ok := c.jobs[""test2""]; !ok { - t.Fatal(""Couldn't find job test2"") - } +type testJob struct { + wg *sync.WaitGroup + name string } -func TestCronRemoveAll(t *testing.T) { - c := New() +func (t testJob) Run() { + t.wg.Done() +} - if err := c.Add(""test1"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) +// Test that adding an invalid job spec returns an error +func TestInvalidJobSpec(t *testing.T) { + cron := New() + _, err := cron.AddJob(""this will not parse"", nil) + if err == nil { + t.Errorf(""expected an error with invalid spec, got nil"") } +} - if err := c.Add(""test2"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) - } +// Test blocking run method behaves as Start() +func TestBlockingRun(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) - if err := c.Add(""test3"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) - } + cron := newWithSeconds() + cron.AddFunc(""* * * * * ?"", func() { wg.Done() }) + + var unblockChan = make(chan struct{}) - if v := len(c.jobs); v != 3 { - t.Fatalf(""Expected %d jobs, got %d"", 3, v) + go func() { + cron.Run() + close(unblockChan) + }() + defer cron.Stop() + + select { + case <-time.After(OneSecond): + t.Error(""expected job fires"") + case <-unblockChan: + t.Error(""expected that Run() blocks"") + case <-wait(wg): } +} + +// Test that double-running is a no-op +func TestStartNoop(t *testing.T) { + var tickChan = make(chan struct{}, 2) + + cron := newWithSeconds() + cron.AddFunc(""* * * * * ?"", func() { + tickChan <- struct{}{} + }) + + cron.Start() + defer cron.Stop() - c.RemoveAll() + // Wait for the first firing to ensure the runner is going + <-tickChan - if v := len(c.jobs); v != 0 { - t.Fatalf(""Expected %d jobs, got %d"", 0, v) + cron.Start() + + <-tickChan + + // Fail if this job fires again in a short period, indicating a double-run + select { + case <-time.After(time.Millisecond): + case <-tickChan: + t.Error(""expected job fires exactly twice"") } } -func TestCronTotal(t *testing.T) { - c := New() +// Simple test using Runnables. +func TestJob(t *testing.T) { + wg := &sync.WaitGroup{} + wg.Add(1) + + cron := newWithSeconds() + cron.AddJob(""0 0 0 30 Feb ?"", testJob{wg, ""job0""}) + cron.AddJob(""0 0 0 1 1 ?"", testJob{wg, ""job1""}) + job2, _ := cron.AddJob(""* * * * * ?"", testJob{wg, ""job2""}) + cron.AddJob(""1 0 0 1 1 ?"", testJob{wg, ""job3""}) + cron.Schedule(Every(5*time.Second+5*time.Nanosecond), testJob{wg, ""job4""}) + job5 := cron.Schedule(Every(5*time.Minute), testJob{wg, ""job5""}) + + // Test getting an Entry pre-Start. + if actualName := cron.Entry(job2).Job.(testJob).name; actualName != ""job2"" { + t.Error(""wrong job retrieved:"", actualName) + } + if actualName := cron.Entry(job5).Job.(testJob).name; actualName != ""job5"" { + t.Error(""wrong job retrieved:"", actualName) + } + + cron.Start() + defer cron.Stop() - if v := c.Total(); v != 0 { - t.Fatalf(""Expected 0 jobs, got %v"", v) + select { + case <-time.After(OneSecond): + t.FailNow() + case <-wait(wg): } - if err := c.Add(""test1"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) + // Ensure the entries are in the right order. + expecteds := []string{""job2"", ""job4"", ""job5"", ""job1"", ""job3"", ""job0""} + + var actuals []string + for _, entry := range cron.Entries() { + actuals = append(actuals, entry.Job.(testJob).name) } - if err := c.Add(""test2"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) + for i, expected := range expecteds { + if actuals[i] != expected { + t.Fatalf(""Jobs not in the right order. (expected) %s != %s (actual)"", expecteds, actuals) + } } - // overwrite - if err := c.Add(""test1"", ""* * * * *"", func() {}); err != nil { - t.Fatal(err) + // Test getting Entries. + if actualName := cron.Entry(job2).Job.(testJob).name; actualName != ""job2"" { + t.Error(""wrong job retrieved:"", actualName) + } + if actualName := cron.Entry(job5).Job.(testJob).name; actualName != ""job5"" { + t.Error(""wrong job retrieved:"", actualName) } +} + +// Issue #206 +// Ensure that the next run of a job after removing an entry is accurate. +func TestScheduleAfterRemoval(t *testing.T) { + var wg1 sync.WaitGroup + var wg2 sync.WaitGroup + wg1.Add(1) + wg2.Add(1) + + // The first time this job is run, set a timer and remove the other job + // 750ms later. Correct behavior would be to still run the job again in + // 250ms, but the bug would cause it to run instead 1s later. + + var calls int + var mu sync.Mutex + + cron := newWithSeconds() + hourJob := cron.Schedule(Every(time.Hour), FuncJob(func() {})) + cron.Schedule(Every(time.Second), FuncJob(func() { + mu.Lock() + defer mu.Unlock() + switch calls { + case 0: + wg1.Done() + calls++ + case 1: + time.Sleep(750 * time.Millisecond) + cron.Remove(hourJob) + calls++ + case 2: + calls++ + wg2.Done() + case 3: + panic(""unexpected 3rd call"") + } + })) + + cron.Start() + defer cron.Stop() - if v := c.Total(); v != 2 { - t.Fatalf(""Expected 2 jobs, got %v"", v) + // the first run might be any length of time 0 - 1s, since the schedule + // rounds to the second. wait for the first run to true up. + wg1.Wait() + + select { + case <-time.After(2 * OneSecond): + t.Error(""expected job fires 2 times"") + case <-wait(&wg2): } } -func TestCronStartStop(t *testing.T) { - c := New() +type ZeroSchedule struct{} + +func (*ZeroSchedule) Next(time.Time) time.Time { + return time.Time{} +} + +// Tests that job without time does not run +func TestJobWithZeroTimeDoesNotRun(t *testing.T) { + cron := newWithSeconds() + var calls int64 + cron.AddFunc(""* * * * * *"", func() { atomic.AddInt64(&calls, 1) }) + cron.Schedule(new(ZeroSchedule), FuncJob(func() { t.Error(""expected zero task will not run"") })) + cron.Start() + defer cron.Stop() + <-time.After(OneSecond) + if atomic.LoadInt64(&calls) != 1 { + t.Errorf(""called %d times, expected 1\n"", calls) + } +} - c.SetInterval(1 * time.Second) +func TestStopAndWait(t *testing.T) { + t.Run(""nothing running, returns immediately"", func(t *testing.T) { + cron := newWithSeconds() + cron.Start() + ctx := cron.Stop() + select { + case <-ctx.Done(): + case <-time.After(time.Millisecond): + t.Error(""context was not done immediately"") + } + }) - test1 := 0 - test2 := 0 + t.Run(""repeated calls to Stop"", func(t *testing.T) { + cron := newWithSeconds() + cron.Start() + _ = cron.Stop() + time.Sleep(time.Millisecond) + ctx := cron.Stop() + select { + case <-ctx.Done(): + case <-time.After(time.Millisecond): + t.Error(""context was not done immediately"") + } + }) - err := c.Add(""test1"", ""* * * * *"", func() { - test1++ + t.Run(""a couple fast jobs added, still returns immediately"", func(t *testing.T) { + cron := newWithSeconds() + cron.AddFunc(""* * * * * *"", func() {}) + cron.Start() + cron.AddFunc(""* * * * * *"", func() {}) + cron.AddFunc(""* * * * * *"", func() {}) + cron.AddFunc(""* * * * * *"", func() {}) + time.Sleep(time.Second) + ctx := cron.Stop() + select { + case <-ctx.Done(): + case <-time.After(time.Millisecond): + t.Error(""context was not done immediately"") + } }) - require.NoError(t, err) - err = c.Add(""test2"", ""* * * * *"", func() { - test2++ + t.Run(""a couple fast jobs and a slow job added, waits for slow job"", func(t *testing.T) { + cron := newWithSeconds() + cron.AddFunc(""* * * * * *"", func() {}) + cron.Start() + cron.AddFunc(""* * * * * *"", func() { time.Sleep(2 * time.Second) }) + cron.AddFunc(""* * * * * *"", func() {}) + time.Sleep(time.Second) + + ctx := cron.Stop() + + // Verify that it is not done for at least 750ms + select { + case <-ctx.Done(): + t.Error(""context was done too quickly immediately"") + case <-time.After(750 * time.Millisecond): + // expected, because the job sleeping for 1 second is still running + } + + // Verify that it IS done in the next 500ms (giving 250ms buffer) + select { + case <-ctx.Done(): + // expected + case <-time.After(1500 * time.Millisecond): + t.Error(""context not done after job should have completed"") + } }) - require.NoError(t, err) - expectedCalls := 3 + t.Run(""repeated calls to stop, waiting for completion and after"", func(t *testing.T) { + cron := newWithSeconds() + cron.AddFunc(""* * * * * *"", func() {}) + cron.AddFunc(""* * * * * *"", func() { time.Sleep(2 * time.Second) }) + cron.Start() + cron.AddFunc(""* * * * * *"", func() {}) + time.Sleep(time.Second) + ctx := cron.Stop() + ctx2 := cron.Stop() + + // Verify that it is not done for at least 1500ms + select { + case <-ctx.Done(): + t.Error(""context was done too quickly immediately"") + case <-ctx2.Done(): + t.Error(""context2 was done too quickly immediately"") + case <-time.After(1500 * time.Millisecond): + // expected, because the job sleeping for 2 seconds is still running + } + + // Verify that it IS done in the next 1s (giving 500ms buffer) + select { + case <-ctx.Done(): + // expected + case <-time.After(time.Second): + t.Error(""context not done after job should have completed"") + } - // call twice Start to check if the previous ticker will be reseted - c.Start() - c.Start() + // Verify that ctx2 is also done. + select { + case <-ctx2.Done(): + // expected + case <-time.After(time.Millisecond): + t.Error(""context2 not done even though context1 is"") + } - time.Sleep(3250 * time.Millisecond) + // Verify that a new context retrieved from stop is immediately done. + ctx3 := cron.Stop() + select { + case <-ctx3.Done(): + // expected + case <-time.After(time.Millisecond): + t.Error(""context not done even when cron Stop is completed"") + } - // call twice Stop to ensure that the second stop is no-op - c.Stop() - c.Stop() + }) +} - if test1 != expectedCalls { - t.Fatalf(""Expected %d test1, got %d"", expectedCalls, test1) - } - if test2 != expectedCalls { - t.Fatalf(""Expected %d test2, got %d"", expectedCalls, test2) - } +func TestMultiThreadedStartAndStop(t *testing.T) { + cron := New() + go cron.Run() + time.Sleep(2 * time.Millisecond) + cron.Stop() +} - // resume for ~5 seconds - c.Start() - time.Sleep(5250 * time.Millisecond) - c.Stop() +func wait(wg *sync.WaitGroup) chan bool { + ch := make(chan bool) + go func() { + wg.Wait() + ch <- true + }() + return ch +} - expectedCalls += 5 +func stop(cron *Cron) chan bool { + ch := make(chan bool) + go func() { + cron.Stop() + ch <- true + }() + return ch +} - if test1 != expectedCalls { - t.Fatalf(""Expected %d test1, got %d"", expectedCalls, test1) - } - if test2 != expectedCalls { - t.Fatalf(""Expected %d test2, got %d"", expectedCalls, test2) - } +// newWithSeconds returns a Cron with the seconds field enabled. +func newWithSeconds() *Cron { + return New(WithParser(secondParser), WithChain()) } diff --git a/internal/cron/logger.go b/internal/cron/logger.go new file mode 100644 index 0000000000000..bfb89f360ca7e --- /dev/null +++ b/internal/cron/logger.go @@ -0,0 +1,86 @@ +package cron + +import ( + ""io"" + ""log"" + ""os"" + ""strings"" + ""time"" +) + +// DefaultLogger is used by Cron if none is specified. +var DefaultLogger Logger = PrintfLogger(log.New(os.Stdout, ""cron: "", log.LstdFlags)) + +// DiscardLogger can be used by callers to discard all log messages. +var DiscardLogger Logger = PrintfLogger(log.New(io.Discard, """", 0)) + +// Logger is the interface used in this package for logging, so that any backend +// can be plugged in. It is a subset of the github.com/go-logr/logr interface. +type Logger interface { + // Info logs routine messages about cron's operation. + Info(msg string, keysAndValues ...interface{}) + // Error logs an error condition. + Error(err error, msg string, keysAndValues ...interface{}) +} + +// PrintfLogger wraps a Printf-based logger (such as the standard library ""log"") +// into an implementation of the Logger interface which logs errors only. +func PrintfLogger(l interface{ Printf(string, ...interface{}) }) Logger { + return printfLogger{l, false} +} + +// VerbosePrintfLogger wraps a Printf-based logger (such as the standard library +// ""log"") into an implementation of the Logger interface which logs everything. +func VerbosePrintfLogger(l interface{ Printf(string, ...interface{}) }) Logger { + return printfLogger{l, true} +} + +type printfLogger struct { + logger interface{ Printf(string, ...interface{}) } + logInfo bool +} + +func (pl printfLogger) Info(msg string, keysAndValues ...interface{}) { + if pl.logInfo { + keysAndValues = formatTimes(keysAndValues) + pl.logger.Printf( + formatString(len(keysAndValues)), + append([]interface{}{msg}, keysAndValues...)...) + } +} + +func (pl printfLogger) Error(err error, msg string, keysAndValues ...interface{}) { + keysAndValues = formatTimes(keysAndValues) + pl.logger.Printf( + formatString(len(keysAndValues)+2), + append([]interface{}{msg, ""error"", err}, keysAndValues...)...) +} + +// formatString returns a logfmt-like format string for the number of +// key/values. +func formatString(numKeysAndValues int) string { + var sb strings.Builder + sb.WriteString(""%s"") + if numKeysAndValues > 0 { + sb.WriteString("", "") + } + for i := 0; i < numKeysAndValues/2; i++ { + if i > 0 { + sb.WriteString("", "") + } + sb.WriteString(""%v=%v"") + } + return sb.String() +} + +// formatTimes formats any time.Time values as RFC3339. +func formatTimes(keysAndValues []interface{}) []interface{} { + var formattedArgs []interface{} + for _, arg := range keysAndValues { + if t, ok := arg.(time.Time); ok { + arg = t.Format(time.RFC3339) + } + formattedArgs = append(formattedArgs, arg) + } + return formattedArgs +} diff --git a/internal/cron/option.go b/internal/cron/option.go new file mode 100644 index 0000000000000..09e4278e779e6 --- /dev/null +++ b/internal/cron/option.go @@ -0,0 +1,45 @@ +package cron + +import ( + ""time"" +) + +// Option represents a modification to the default behavior of a Cron. +type Option func(*Cron) + +// WithLocation overrides the timezone of the cron instance. +func WithLocation(loc *time.Location) Option { + return func(c *Cron) { + c.location = loc + } +} + +// WithSeconds overrides the parser used for interpreting job schedules to +// include a seconds field as the first one. +func WithSeconds() Option { + return WithParser(NewParser( + Second | Minute | Hour | Dom | Month | Dow | Descriptor, + )) +} + +// WithParser overrides the parser used for interpreting job schedules. +func WithParser(p ScheduleParser) Option { + return func(c *Cron) { + c.parser = p + } +} + +// WithChain specifies Job wrappers to apply to all jobs added to this cron. +// Refer to the Chain* functions in this package for provided wrappers. +func WithChain(wrappers ...JobWrapper) Option { + return func(c *Cron) { + c.chain = NewChain(wrappers...) + } +} + +// WithLogger uses the provided logger. +func WithLogger(logger Logger) Option { + return func(c *Cron) { + c.logger = logger + } +} diff --git a/internal/cron/option_test.go b/internal/cron/option_test.go new file mode 100644 index 0000000000000..8aef16823cb93 --- /dev/null +++ b/internal/cron/option_test.go @@ -0,0 +1,42 @@ +package cron + +import ( + ""log"" + ""strings"" + ""testing"" + ""time"" +) + +func TestWithLocation(t *testing.T) { + c := New(WithLocation(time.UTC)) + if c.location != time.UTC { + t.Errorf(""expected UTC, got %v"", c.location) + } +} + +func TestWithParser(t *testing.T) { + var parser = NewParser(Dow) + c := New(WithParser(parser)) + if c.parser != parser { + t.Error(""expected provided parser"") + } +} + +func TestWithVerboseLogger(t *testing.T) { + var buf syncWriter + var logger = log.New(&buf, """", log.LstdFlags) + c := New(WithLogger(VerbosePrintfLogger(logger))) + if c.logger.(printfLogger).logger != logger { + t.Error(""expected provided logger"") + } + + c.AddFunc(""@every 1s"", func() {}) + c.Start() + time.Sleep(OneSecond) + c.Stop() + out := buf.String() + if !strings.Contains(out, ""schedule,"") || + !strings.Contains(out, ""run,"") { + t.Error(""expected to see some actions, got:"", out) + } +} diff --git a/internal/cron/parser.go b/internal/cron/parser.go new file mode 100644 index 0000000000000..ec80e3fd14925 --- /dev/null +++ b/internal/cron/parser.go @@ -0,0 +1,435 @@ +package cron + +import ( + ""fmt"" + ""math"" + ""strconv"" + ""strings"" + ""time"" +) + +// Configuration options for creating a parser. Most options specify which +// fields should be included, while others enable features. If a field is not +// included the parser will assume a default value. These options do not change +// the order fields are parse in. +type ParseOption int + +const ( + Second ParseOption = 1 << iota // Seconds field, default 0 + SecondOptional // Optional seconds field, default 0 + Minute // Minutes field, default 0 + Hour // Hours field, default 0 + Dom // Day of month field, default * + Month // Month field, default * + Dow // Day of week field, default * + DowOptional // Optional day of week field, default * + Descriptor // Allow descriptors such as @monthly, @weekly, etc. +) + +var places = []ParseOption{ + Second, + Minute, + Hour, + Dom, + Month, + Dow, +} + +var defaults = []string{ + ""0"", + ""0"", + ""0"", + ""*"", + ""*"", + ""*"", +} + +// A custom Parser that can be configured. +type Parser struct { + options ParseOption +} + +// NewParser creates a Parser with custom options. +// +// It panics if more than one Optional is given, since it would be impossible to +// correctly infer which optional is provided or missing in general. +// +// Examples +// +// // Standard parser without descriptors +// specParser := NewParser(Minute | Hour | Dom | Month | Dow) +// sched, err := specParser.Parse(""0 0 15 */3 *"") +// +// // Same as above, just excludes time fields +// specParser := NewParser(Dom | Month | Dow) +// sched, err := specParser.Parse(""15 */3 *"") +// +// // Same as above, just makes Dow optional +// specParser := NewParser(Dom | Month | DowOptional) +// sched, err := specParser.Parse(""15 */3"") +func NewParser(options ParseOption) Parser { + optionals := 0 + if options&DowOptional > 0 { + optionals++ + } + if options&SecondOptional > 0 { + optionals++ + } + if optionals > 1 { + panic(""multiple optionals may not be configured"") + } + return Parser{options} +} + +// Parse returns a new crontab schedule representing the given spec. +// It returns a descriptive error if the spec is not valid. +// It accepts crontab specs and features configured by NewParser. +func (p Parser) Parse(spec string) (Schedule, error) { + if len(spec) == 0 { + return nil, fmt.Errorf(""empty spec string"") + } + + // Extract timezone if present + var loc = time.Local + if strings.HasPrefix(spec, ""TZ="") || strings.HasPrefix(spec, ""CRON_TZ="") { + var err error + i := strings.Index(spec, "" "") + eq := strings.Index(spec, ""="") + if loc, err = time.LoadLocation(spec[eq+1 : i]); err != nil { + return nil, fmt.Errorf(""provided bad location %s: %v"", spec[eq+1:i], err) + } + spec = strings.TrimSpace(spec[i:]) + } + + // Handle named schedules (descriptors), if configured + if strings.HasPrefix(spec, ""@"") { + if p.options&Descriptor == 0 { + return nil, fmt.Errorf(""parser does not accept descriptors: %v"", spec) + } + return parseDescriptor(spec, loc) + } + + // Split on whitespace. + fields := strings.Fields(spec) + + // Validate & fill in any omitted or optional fields + var err error + fields, err = normalizeFields(fields, p.options) + if err != nil { + return nil, err + } + + field := func(field string, r bounds) uint64 { + if err != nil { + return 0 + } + var bits uint64 + bits, err = getField(field, r) + return bits + } + + var ( + second = field(fields[0], seconds) + minute = field(fields[1], minutes) + hour = field(fields[2], hours) + dayofmonth = field(fields[3], dom) + month = field(fields[4], months) + dayofweek = field(fields[5], dow) + ) + if err != nil { + return nil, err + } + + return &SpecSchedule{ + Second: second, + Minute: minute, + Hour: hour, + Dom: dayofmonth, + Month: month, + Dow: dayofweek, + Location: loc, + }, nil +} + +// normalizeFields takes a subset set of the time fields and returns the full set +// with defaults (zeroes) populated for unset fields. +// +// As part of performing this function, it also validates that the provided +// fields are compatible with the configured options. +func normalizeFields(fields []string, options ParseOption) ([]string, error) { + // Validate optionals & add their field to options + optionals := 0 + if options&SecondOptional > 0 { + options |= Second + optionals++ + } + if options&DowOptional > 0 { + options |= Dow + optionals++ + } + if optionals > 1 { + return nil, fmt.Errorf(""multiple optionals may not be configured"") + } + + // Figure out how many fields we need + max := 0 + for _, place := range places { + if options&place > 0 { + max++ + } + } + min := max - optionals + + // Validate number of fields + if count := len(fields); count < min || count > max { + if min == max { + return nil, fmt.Errorf(""expected exactly %d fields, found %d: %s"", min, count, fields) + } + return nil, fmt.Errorf(""expected %d to %d fields, found %d: %s"", min, max, count, fields) + } + + // Populate the optional field if not provided + if min < max && len(fields) == min { + switch { + case options&DowOptional > 0: + fields = append(fields, defaults[5]) // TODO: improve access to default + case options&SecondOptional > 0: + fields = append([]string{defaults[0]}, fields...) + default: + return nil, fmt.Errorf(""unknown optional field"") + } + } + + // Populate all fields not part of options with their defaults + n := 0 + expandedFields := make([]string, len(places)) + copy(expandedFields, defaults) + for i, place := range places { + if options&place > 0 { + expandedFields[i] = fields[n] + n++ + } + } + return expandedFields, nil +} + +var standardParser = NewParser( + Minute | Hour | Dom | Month | Dow | Descriptor, +) + +// ParseStandard returns a new crontab schedule representing the given +// standardSpec (https://en.wikipedia.org/wiki/Cron). It requires 5 entries +// representing: minute, hour, day of month, month and day of week, in that +// order. It returns a descriptive error if the spec is not valid. +// +// It accepts +// - Standard crontab specs, e.g. ""* * * * ?"" +// - Descriptors, e.g. ""@midnight"", ""@every 1h30m"" +func ParseStandard(standardSpec string) (Schedule, error) { + return standardParser.Parse(standardSpec) +} + +// getField returns an Int with the bits set representing all of the times that +// the field represents or error parsing field value. A ""field"" is a comma-separated +// list of ""ranges"". +func getField(field string, r bounds) (uint64, error) { + var bits uint64 + ranges := strings.FieldsFunc(field, func(r rune) bool { return r == ',' }) + for _, expr := range ranges { + bit, err := getRange(expr, r) + if err != nil { + return bits, err + } + bits |= bit + } + return bits, nil +} + +// getRange returns the bits indicated by the given expression: +// +// number | number ""-"" number [ ""/"" number ] +// +// or error parsing range. +func getRange(expr string, r bounds) (uint64, error) { + var ( + start, end, step uint + rangeAndStep = strings.Split(expr, ""/"") + lowAndHigh = strings.Split(rangeAndStep[0], ""-"") + singleDigit = len(lowAndHigh) == 1 + err error + ) + + var extra uint64 + if lowAndHigh[0] == ""*"" || lowAndHigh[0] == ""?"" { + start = r.min + end = r.max + extra = starBit + } else { + start, err = parseIntOrName(lowAndHigh[0], r.names) + if err != nil { + return 0, err + } + switch len(lowAndHigh) { + case 1: + end = start + case 2: + end, err = parseIntOrName(lowAndHigh[1], r.names) + if err != nil { + return 0, err + } + default: + return 0, fmt.Errorf(""too many hyphens: %s"", expr) + } + } + + switch len(rangeAndStep) { + case 1: + step = 1 + case 2: + step, err = mustParseInt(rangeAndStep[1]) + if err != nil { + return 0, err + } + + // Special handling: ""N/step"" means ""N-max/step"". + if singleDigit { + end = r.max + } + if step > 1 { + extra = 0 + } + default: + return 0, fmt.Errorf(""too many slashes: %s"", expr) + } + + if start < r.min { + return 0, fmt.Errorf(""beginning of range (%d) below minimum (%d): %s"", start, r.min, expr) + } + if end > r.max { + return 0, fmt.Errorf(""end of range (%d) above maximum (%d): %s"", end, r.max, expr) + } + if start > end { + return 0, fmt.Errorf(""beginning of range (%d) beyond end of range (%d): %s"", start, end, expr) + } + if step == 0 { + return 0, fmt.Errorf(""step of range should be a positive number: %s"", expr) + } + + return getBits(start, end, step) | extra, nil +} + +// parseIntOrName returns the (possibly-named) integer contained in expr. +func parseIntOrName(expr string, names map[string]uint) (uint, error) { + if names != nil { + if namedInt, ok := names[strings.ToLower(expr)]; ok { + return namedInt, nil + } + } + return mustParseInt(expr) +} + +// mustParseInt parses the given expression as an int or returns an error. +func mustParseInt(expr string) (uint, error) { + num, err := strconv.Atoi(expr) + if err != nil { + return 0, fmt.Errorf(""failed to parse int from %s: %s"", expr, err) + } + if num < 0 { + return 0, fmt.Errorf(""negative number (%d) not allowed: %s"", num, expr) + } + + return uint(num), nil +} + +// getBits sets all bits in the range [min, max], modulo the given step size. +func getBits(min, max, step uint) uint64 { + var bits uint64 + + // If step is 1, use shifts. + if step == 1 { + return ^(math.MaxUint64 << (max + 1)) & (math.MaxUint64 << min) + } + + // Else, use a simple loop. + for i := min; i <= max; i += step { + bits |= 1 << i + } + return bits +} + +// all returns all bits within the given bounds. (plus the star bit) +func all(r bounds) uint64 { + return getBits(r.min, r.max, 1) | starBit +} + +// parseDescriptor returns a predefined schedule for the expression, or error if none matches. +func parseDescriptor(descriptor string, loc *time.Location) (Schedule, error) { + switch descriptor { + case ""@yearly"", ""@annually"": + return &SpecSchedule{ + Second: 1 << seconds.min, + Minute: 1 << minutes.min, + Hour: 1 << hours.min, + Dom: 1 << dom.min, + Month: 1 << months.min, + Dow: all(dow), + Location: loc, + }, nil + + case ""@monthly"": + return &SpecSchedule{ + Second: 1 << seconds.min, + Minute: 1 << minutes.min, + Hour: 1 << hours.min, + Dom: 1 << dom.min, + Month: all(months), + Dow: all(dow), + Location: loc, + }, nil + + case ""@weekly"": + return &SpecSchedule{ + Second: 1 << seconds.min, + Minute: 1 << minutes.min, + Hour: 1 << hours.min, + Dom: all(dom), + Month: all(months), + Dow: 1 << dow.min, + Location: loc, + }, nil + + case ""@daily"", ""@midnight"": + return &SpecSchedule{ + Second: 1 << seconds.min, + Minute: 1 << minutes.min, + Hour: 1 << hours.min, + Dom: all(dom), + Month: all(months), + Dow: all(dow), + Location: loc, + }, nil + + case ""@hourly"": + return &SpecSchedule{ + Second: 1 << seconds.min, + Minute: 1 << minutes.min, + Hour: all(hours), + Dom: all(dom), + Month: all(months), + Dow: all(dow), + Location: loc, + }, nil + + } + + const every = ""@every "" + if strings.HasPrefix(descriptor, every) { + duration, err := time.ParseDuration(descriptor[len(every):]) + if err != nil { + return nil, fmt.Errorf(""failed to parse duration %s: %s"", descriptor, err) + } + return Every(duration), nil + } + + return nil, fmt.Errorf(""unrecognized descriptor: %s"", descriptor) +} diff --git a/internal/cron/parser_test.go b/internal/cron/parser_test.go new file mode 100644 index 0000000000000..41c8c52010bc2 --- /dev/null +++ b/internal/cron/parser_test.go @@ -0,0 +1,383 @@ +package cron + +import ( + ""reflect"" + ""strings"" + ""testing"" + ""time"" +) + +var secondParser = NewParser(Second | Minute | Hour | Dom | Month | DowOptional | Descriptor) + +func TestRange(t *testing.T) { + zero := uint64(0) + ranges := []struct { + expr string + min, max uint + expected uint64 + err string + }{ + {""5"", 0, 7, 1 << 5, """"}, + {""0"", 0, 7, 1 << 0, """"}, + {""7"", 0, 7, 1 << 7, """"}, + + {""5-5"", 0, 7, 1 << 5, """"}, + {""5-6"", 0, 7, 1<<5 | 1<<6, """"}, + {""5-7"", 0, 7, 1<<5 | 1<<6 | 1<<7, """"}, + + {""5-6/2"", 0, 7, 1 << 5, """"}, + {""5-7/2"", 0, 7, 1<<5 | 1<<7, """"}, + {""5-7/1"", 0, 7, 1<<5 | 1<<6 | 1<<7, """"}, + + {""*"", 1, 3, 1<<1 | 1<<2 | 1<<3 | starBit, """"}, + {""*/2"", 1, 3, 1<<1 | 1<<3, """"}, + + {""5--5"", 0, 0, zero, ""too many hyphens""}, + {""jan-x"", 0, 0, zero, ""failed to parse int from""}, + {""2-x"", 1, 5, zero, ""failed to parse int from""}, + {""*/-12"", 0, 0, zero, ""negative number""}, + {""*//2"", 0, 0, zero, ""too many slashes""}, + {""1"", 3, 5, zero, ""below minimum""}, + {""6"", 3, 5, zero, ""above maximum""}, + {""5-3"", 3, 5, zero, ""beyond end of range""}, + {""*/0"", 0, 0, zero, ""should be a positive number""}, + } + + for _, c := range ranges { + actual, err := getRange(c.expr, bounds{c.min, c.max, nil}) + if len(c.err) != 0 && (err == nil || !strings.Contains(err.Error(), c.err)) { + t.Errorf(""%s => expected %v, got %v"", c.expr, c.err, err) + } + if len(c.err) == 0 && err != nil { + t.Errorf(""%s => unexpected error %v"", c.expr, err) + } + if actual != c.expected { + t.Errorf(""%s => expected %d, got %d"", c.expr, c.expected, actual) + } + } +} + +func TestField(t *testing.T) { + fields := []struct { + expr string + min, max uint + expected uint64 + }{ + {""5"", 1, 7, 1 << 5}, + {""5,6"", 1, 7, 1<<5 | 1<<6}, + {""5,6,7"", 1, 7, 1<<5 | 1<<6 | 1<<7}, + {""1,5-7/2,3"", 1, 7, 1<<1 | 1<<5 | 1<<7 | 1<<3}, + } + + for _, c := range fields { + actual, _ := getField(c.expr, bounds{c.min, c.max, nil}) + if actual != c.expected { + t.Errorf(""%s => expected %d, got %d"", c.expr, c.expected, actual) + } + } +} + +func TestAll(t *testing.T) { + allBits := []struct { + r bounds + expected uint64 + }{ + {minutes, 0xfffffffffffffff}, // 0-59: 60 ones + {hours, 0xffffff}, // 0-23: 24 ones + {dom, 0xfffffffe}, // 1-31: 31 ones, 1 zero + {months, 0x1ffe}, // 1-12: 12 ones, 1 zero + {dow, 0x7f}, // 0-6: 7 ones + } + + for _, c := range allBits { + actual := all(c.r) // all() adds the starBit, so compensate for that.. + if c.expected|starBit != actual { + t.Errorf(""%d-%d/%d => expected %b, got %b"", + c.r.min, c.r.max, 1, c.expected|starBit, actual) + } + } +} + +func TestBits(t *testing.T) { + bits := []struct { + min, max, step uint + expected uint64 + }{ + {0, 0, 1, 0x1}, + {1, 1, 1, 0x2}, + {1, 5, 2, 0x2a}, // 101010 + {1, 4, 2, 0xa}, // 1010 + } + + for _, c := range bits { + actual := getBits(c.min, c.max, c.step) + if c.expected != actual { + t.Errorf(""%d-%d/%d => expected %b, got %b"", + c.min, c.max, c.step, c.expected, actual) + } + } +} + +func TestParseScheduleErrors(t *testing.T) { + var tests = []struct{ expr, err string }{ + {""* 5 j * * *"", ""failed to parse int from""}, + {""@every Xm"", ""failed to parse duration""}, + {""@unrecognized"", ""unrecognized descriptor""}, + {""* * * *"", ""expected 5 to 6 fields""}, + {"""", ""empty spec string""}, + } + for _, c := range tests { + actual, err := secondParser.Parse(c.expr) + if err == nil || !strings.Contains(err.Error(), c.err) { + t.Errorf(""%s => expected %v, got %v"", c.expr, c.err, err) + } + if actual != nil { + t.Errorf(""expected nil schedule on error, got %v"", actual) + } + } +} + +func TestParseSchedule(t *testing.T) { + tokyo, _ := time.LoadLocation(""Asia/Tokyo"") + entries := []struct { + parser Parser + expr string + expected Schedule + }{ + {secondParser, ""0 5 * * * *"", every5min(time.Local)}, + {standardParser, ""5 * * * *"", every5min(time.Local)}, + {secondParser, ""CRON_TZ=UTC 0 5 * * * *"", every5min(time.UTC)}, + {standardParser, ""CRON_TZ=UTC 5 * * * *"", every5min(time.UTC)}, + {secondParser, ""CRON_TZ=Asia/Tokyo 0 5 * * * *"", every5min(tokyo)}, + {secondParser, ""@every 5m"", ConstantDelaySchedule{5 * time.Minute}}, + {secondParser, ""@midnight"", midnight(time.Local)}, + {secondParser, ""TZ=UTC @midnight"", midnight(time.UTC)}, + {secondParser, ""TZ=Asia/Tokyo @midnight"", midnight(tokyo)}, + {secondParser, ""@yearly"", annual(time.Local)}, + {secondParser, ""@annually"", annual(time.Local)}, + { + parser: secondParser, + expr: ""* 5 * * * *"", + expected: &SpecSchedule{ + Second: all(seconds), + Minute: 1 << 5, + Hour: all(hours), + Dom: all(dom), + Month: all(months), + Dow: all(dow), + Location: time.Local, + }, + }, + } + + for _, c := range entries { + actual, err := c.parser.Parse(c.expr) + if err != nil { + t.Errorf(""%s => unexpected error %v"", c.expr, err) + } + if !reflect.DeepEqual(actual, c.expected) { + t.Errorf(""%s => expected %b, got %b"", c.expr, c.expected, actual) + } + } +} + +func TestOptionalSecondSchedule(t *testing.T) { + parser := NewParser(SecondOptional | Minute | Hour | Dom | Month | Dow | Descriptor) + entries := []struct { + expr string + expected Schedule + }{ + {""0 5 * * * *"", every5min(time.Local)}, + {""5 5 * * * *"", every5min5s(time.Local)}, + {""5 * * * *"", every5min(time.Local)}, + } + + for _, c := range entries { + actual, err := parser.Parse(c.expr) + if err != nil { + t.Errorf(""%s => unexpected error %v"", c.expr, err) + } + if !reflect.DeepEqual(actual, c.expected) { + t.Errorf(""%s => expected %b, got %b"", c.expr, c.expected, actual) + } + } +} + +func TestNormalizeFields(t *testing.T) { + tests := []struct { + name string + input []string + options ParseOption + expected []string + }{ + { + ""AllFields_NoOptional"", + []string{""0"", ""5"", ""*"", ""*"", ""*"", ""*""}, + Second | Minute | Hour | Dom | Month | Dow | Descriptor, + []string{""0"", ""5"", ""*"", ""*"", ""*"", ""*""}, + }, + { + ""AllFields_SecondOptional_Provided"", + []string{""0"", ""5"", ""*"", ""*"", ""*"", ""*""}, + SecondOptional | Minute | Hour | Dom | Month | Dow | Descriptor, + []string{""0"", ""5"", ""*"", ""*"", ""*"", ""*""}, + }, + { + ""AllFields_SecondOptional_NotProvided"", + []string{""5"", ""*"", ""*"", ""*"", ""*""}, + SecondOptional | Minute | Hour | Dom | Month | Dow | Descriptor, + []string{""0"", ""5"", ""*"", ""*"", ""*"", ""*""}, + }, + { + ""SubsetFields_NoOptional"", + []string{""5"", ""15"", ""*""}, + Hour | Dom | Month, + []string{""0"", ""0"", ""5"", ""15"", ""*"", ""*""}, + }, + { + ""SubsetFields_DowOptional_Provided"", + []string{""5"", ""15"", ""*"", ""4""}, + Hour | Dom | Month | DowOptional, + []string{""0"", ""0"", ""5"", ""15"", ""*"", ""4""}, + }, + { + ""SubsetFields_DowOptional_NotProvided"", + []string{""5"", ""15"", ""*""}, + Hour | Dom | Month | DowOptional, + []string{""0"", ""0"", ""5"", ""15"", ""*"", ""*""}, + }, + { + ""SubsetFields_SecondOptional_NotProvided"", + []string{""5"", ""15"", ""*""}, + SecondOptional | Hour | Dom | Month, + []string{""0"", ""0"", ""5"", ""15"", ""*"", ""*""}, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + actual, err := normalizeFields(test.input, test.options) + if err != nil { + t.Errorf(""unexpected error: %v"", err) + } + if !reflect.DeepEqual(actual, test.expected) { + t.Errorf(""expected %v, got %v"", test.expected, actual) + } + }) + } +} + +func TestNormalizeFields_Errors(t *testing.T) { + tests := []struct { + name string + input []string + options ParseOption + err string + }{ + { + ""TwoOptionals"", + []string{""0"", ""5"", ""*"", ""*"", ""*"", ""*""}, + SecondOptional | Minute | Hour | Dom | Month | DowOptional, + """", + }, + { + ""TooManyFields"", + []string{""0"", ""5"", ""*"", ""*""}, + SecondOptional | Minute | Hour, + """", + }, + { + ""NoFields"", + []string{}, + SecondOptional | Minute | Hour, + """", + }, + { + ""TooFewFields"", + []string{""*""}, + SecondOptional | Minute | Hour, + """", + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + actual, err := normalizeFields(test.input, test.options) + if err == nil { + t.Errorf(""expected an error, got none. results: %v"", actual) + } + if !strings.Contains(err.Error(), test.err) { + t.Errorf(""expected error %q, got %q"", test.err, err.Error()) + } + }) + } +} + +func TestStandardSpecSchedule(t *testing.T) { + entries := []struct { + expr string + expected Schedule + err string + }{ + { + expr: ""5 * * * *"", + expected: &SpecSchedule{1 << seconds.min, 1 << 5, all(hours), all(dom), all(months), all(dow), time.Local}, + }, + { + expr: ""@every 5m"", + expected: ConstantDelaySchedule{time.Duration(5) * time.Minute}, + }, + { + expr: ""5 j * * *"", + err: ""failed to parse int from"", + }, + { + expr: ""* * * *"", + err: ""expected exactly 5 fields"", + }, + } + + for _, c := range entries { + actual, err := ParseStandard(c.expr) + if len(c.err) != 0 && (err == nil || !strings.Contains(err.Error(), c.err)) { + t.Errorf(""%s => expected %v, got %v"", c.expr, c.err, err) + } + if len(c.err) == 0 && err != nil { + t.Errorf(""%s => unexpected error %v"", c.expr, err) + } + if !reflect.DeepEqual(actual, c.expected) { + t.Errorf(""%s => expected %b, got %b"", c.expr, c.expected, actual) + } + } +} + +func TestNoDescriptorParser(t *testing.T) { + parser := NewParser(Minute | Hour) + _, err := parser.Parse(""@every 1m"") + if err == nil { + t.Error(""expected an error, got none"") + } +} + +func every5min(loc *time.Location) *SpecSchedule { + return &SpecSchedule{1 << 0, 1 << 5, all(hours), all(dom), all(months), all(dow), loc} +} + +func every5min5s(loc *time.Location) *SpecSchedule { + return &SpecSchedule{1 << 5, 1 << 5, all(hours), all(dom), all(months), all(dow), loc} +} + +func midnight(loc *time.Location) *SpecSchedule { + return &SpecSchedule{1, 1, 1, all(dom), all(months), all(dow), loc} +} + +func annual(loc *time.Location) *SpecSchedule { + return &SpecSchedule{ + Second: 1 << seconds.min, + Minute: 1 << minutes.min, + Hour: 1 << hours.min, + Dom: 1 << dom.min, + Month: 1 << months.min, + Dow: all(dow), + Location: loc, + } +} diff --git a/internal/cron/schedule.go b/internal/cron/schedule.go deleted file mode 100644 index 48b1b89909d6c..0000000000000 --- a/internal/cron/schedule.go +++ /dev/null @@ -1,194 +0,0 @@ -package cron - -import ( - ""strconv"" - ""strings"" - ""time"" - - ""github.com/pkg/errors"" -) - -// Moment represents a parsed single time moment. -type Moment struct { - Minute int `json:""minute""` - Hour int `json:""hour""` - Day int `json:""day""` - Month int `json:""month""` - DayOfWeek int `json:""dayOfWeek""` -} - -// NewMoment creates a new Moment from the specified time. -func NewMoment(t time.Time) *Moment { - return &Moment{ - Minute: t.Minute(), - Hour: t.Hour(), - Day: t.Day(), - Month: int(t.Month()), - DayOfWeek: int(t.Weekday()), - } -} - -// Schedule stores parsed information for each time component when a cron job should run. -type Schedule struct { - Minutes map[int]struct{} `json:""minutes""` - Hours map[int]struct{} `json:""hours""` - Days map[int]struct{} `json:""days""` - Months map[int]struct{} `json:""months""` - DaysOfWeek map[int]struct{} `json:""daysOfWeek""` -} - -// IsDue checks whether the provided Moment satisfies the current Schedule. -func (s *Schedule) IsDue(m *Moment) bool { - if _, ok := s.Minutes[m.Minute]; !ok { - return false - } - - if _, ok := s.Hours[m.Hour]; !ok { - return false - } - - if _, ok := s.Days[m.Day]; !ok { - return false - } - - if _, ok := s.DaysOfWeek[m.DayOfWeek]; !ok { - return false - } - - if _, ok := s.Months[m.Month]; !ok { - return false - } - - return true -} - -// NewSchedule creates a new Schedule from a cron expression. -// -// A cron expression is consisted of 5 segments separated by space, -// representing: minute, hour, day of the month, month and day of the week. -// -// Each segment could be in the following formats: -// - wildcard: * -// - range: 1-30 -// - step: */n or 1-30/n -// - list: 1,2,3,10-20/n -func NewSchedule(cronExpr string) (*Schedule, error) { - segments := strings.Split(cronExpr, "" "") - if len(segments) != 5 { - return nil, errors.New(""invalid cron expression - must have exactly 5 space separated segments"") - } - - minutes, err := parseCronSegment(segments[0], 0, 59) - if err != nil { - return nil, err - } - - hours, err := parseCronSegment(segments[1], 0, 23) - if err != nil { - return nil, err - } - - days, err := parseCronSegment(segments[2], 1, 31) - if err != nil { - return nil, err - } - - months, err := parseCronSegment(segments[3], 1, 12) - if err != nil { - return nil, err - } - - daysOfWeek, err := parseCronSegment(segments[4], 0, 6) - if err != nil { - return nil, err - } - - return &Schedule{ - Minutes: minutes, - Hours: hours, - Days: days, - Months: months, - DaysOfWeek: daysOfWeek, - }, nil -} - -// parseCronSegment parses a single cron expression segment and -// returns its time schedule slots. -func parseCronSegment(segment string, min int, max int) (map[int]struct{}, error) { - slots := map[int]struct{}{} - - list := strings.Split(segment, "","") - for _, p := range list { - stepParts := strings.Split(p, ""/"") - - // step (*/n, 1-30/n) - var step int - switch len(stepParts) { - case 1: - step = 1 - case 2: - parsedStep, err := strconv.Atoi(stepParts[1]) - if err != nil { - return nil, err - } - if parsedStep < 1 || parsedStep > max { - return nil, errors.Errorf(""invalid segment step boundary - the step must be between 1 and the %d"", max) - } - step = parsedStep - default: - return nil, errors.New(""invalid segment step format - must be in the format */n or 1-30/n"") - } - - // find the min and max range of the segment part - var rangeMin, rangeMax int - if stepParts[0] == ""*"" { - rangeMin = min - rangeMax = max - } else { - // single digit (1) or range (1-30) - rangeParts := strings.Split(stepParts[0], ""-"") - switch len(rangeParts) { - case 1: - if step != 1 { - return nil, errors.New(""invalid segment step - step > 1 could be used only with the wildcard or range format"") - } - parsed, err := strconv.Atoi(rangeParts[0]) - if err != nil { - return nil, err - } - if parsed < min || parsed > max { - return nil, errors.New(""invalid segment value - must be between the min and max of the segment"") - } - rangeMin = parsed - rangeMax = rangeMin - case 2: - parsedMin, err := strconv.Atoi(rangeParts[0]) - if err != nil { - return nil, err - } - if parsedMin < min || parsedMin > max { - return nil, errors.Errorf(""invalid segment range minimum - must be between %d and %d"", min, max) - } - rangeMin = parsedMin - - parsedMax, err := strconv.Atoi(rangeParts[1]) - if err != nil { - return nil, err - } - if parsedMax < parsedMin || parsedMax > max { - return nil, errors.Errorf(""invalid segment range maximum - must be between %d and %d"", rangeMin, max) - } - rangeMax = parsedMax - default: - return nil, errors.New(""invalid segment range format - the range must have 1 or 2 parts"") - } - } - - // fill the slots - for i := rangeMin; i <= rangeMax; i += step { - slots[i] = struct{}{} - } - } - - return slots, nil -} diff --git a/internal/cron/schedule_test.go b/internal/cron/schedule_test.go deleted file mode 100644 index 01048051cf638..0000000000000 --- a/internal/cron/schedule_test.go +++ /dev/null @@ -1,361 +0,0 @@ -package cron_test - -import ( - ""encoding/json"" - ""testing"" - ""time"" - - ""github.com/usememos/memos/internal/cron"" -) - -func TestNewMoment(t *testing.T) { - date, err := time.Parse(""2006-01-02 15:04"", ""2023-05-09 15:20"") - if err != nil { - t.Fatal(err) - } - - m := cron.NewMoment(date) - - if m.Minute != 20 { - t.Fatalf(""Expected m.Minute %d, got %d"", 20, m.Minute) - } - - if m.Hour != 15 { - t.Fatalf(""Expected m.Hour %d, got %d"", 15, m.Hour) - } - - if m.Day != 9 { - t.Fatalf(""Expected m.Day %d, got %d"", 9, m.Day) - } - - if m.Month != 5 { - t.Fatalf(""Expected m.Month %d, got %d"", 5, m.Month) - } - - if m.DayOfWeek != 2 { - t.Fatalf(""Expected m.DayOfWeek %d, got %d"", 2, m.DayOfWeek) - } -} - -func TestNewSchedule(t *testing.T) { - scenarios := []struct { - cronExpr string - expectError bool - expectSchedule string - }{ - { - ""invalid"", - true, - """", - }, - { - ""* * * *"", - true, - """", - }, - { - ""* * * * * *"", - true, - """", - }, - { - ""2/3 * * * *"", - true, - """", - }, - { - ""* * * * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""*/2 */3 */5 */4 */2"", - false, - `{""minutes"":{""0"":{},""10"":{},""12"":{},""14"":{},""16"":{},""18"":{},""2"":{},""20"":{},""22"":{},""24"":{},""26"":{},""28"":{},""30"":{},""32"":{},""34"":{},""36"":{},""38"":{},""4"":{},""40"":{},""42"":{},""44"":{},""46"":{},""48"":{},""50"":{},""52"":{},""54"":{},""56"":{},""58"":{},""6"":{},""8"":{}},""hours"":{""0"":{},""12"":{},""15"":{},""18"":{},""21"":{},""3"":{},""6"":{},""9"":{}},""days"":{""1"":{},""11"":{},""16"":{},""21"":{},""26"":{},""31"":{},""6"":{}},""months"":{""1"":{},""5"":{},""9"":{}},""daysOfWeek"":{""0"":{},""2"":{},""4"":{},""6"":{}}}`, - }, - - // minute segment - { - ""-1 * * * *"", - true, - """", - }, - { - ""60 * * * *"", - true, - """", - }, - { - ""0 * * * *"", - false, - `{""minutes"":{""0"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""59 * * * *"", - false, - `{""minutes"":{""59"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""1,2,5,7,40-50/2 * * * *"", - false, - `{""minutes"":{""1"":{},""2"":{},""40"":{},""42"":{},""44"":{},""46"":{},""48"":{},""5"":{},""50"":{},""7"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - - // hour segment - { - ""* -1 * * *"", - true, - """", - }, - { - ""* 24 * * *"", - true, - """", - }, - { - ""* 0 * * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""* 23 * * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""23"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""* 3,4,8-16/3,7 * * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""11"":{},""14"":{},""3"":{},""4"":{},""7"":{},""8"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - - // day segment - { - ""* * 0 * *"", - true, - """", - }, - { - ""* * 32 * *"", - true, - """", - }, - { - ""* * 1 * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""* * 31 * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""31"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""* * 5,6,20-30/3,1 * *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""20"":{},""23"":{},""26"":{},""29"":{},""5"":{},""6"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - - // month segment - { - ""* * * 0 *"", - true, - """", - }, - { - ""* * * 13 *"", - true, - """", - }, - { - ""* * * 1 *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""* * * 12 *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""12"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - { - ""* * * 1,4,5-10/2 *"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""4"":{},""5"":{},""7"":{},""9"":{}},""daysOfWeek"":{""0"":{},""1"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{}}}`, - }, - - // day of week segment - { - ""* * * * -1"", - true, - """", - }, - { - ""* * * * 7"", - true, - """", - }, - { - ""* * * * 0"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""0"":{}}}`, - }, - { - ""* * * * 6"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""6"":{}}}`, - }, - { - ""* * * * 1,2-5/2"", - false, - `{""minutes"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""32"":{},""33"":{},""34"":{},""35"":{},""36"":{},""37"":{},""38"":{},""39"":{},""4"":{},""40"":{},""41"":{},""42"":{},""43"":{},""44"":{},""45"":{},""46"":{},""47"":{},""48"":{},""49"":{},""5"":{},""50"":{},""51"":{},""52"":{},""53"":{},""54"":{},""55"":{},""56"":{},""57"":{},""58"":{},""59"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""hours"":{""0"":{},""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""days"":{""1"":{},""10"":{},""11"":{},""12"":{},""13"":{},""14"":{},""15"":{},""16"":{},""17"":{},""18"":{},""19"":{},""2"":{},""20"":{},""21"":{},""22"":{},""23"":{},""24"":{},""25"":{},""26"":{},""27"":{},""28"":{},""29"":{},""3"":{},""30"":{},""31"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""months"":{""1"":{},""10"":{},""11"":{},""12"":{},""2"":{},""3"":{},""4"":{},""5"":{},""6"":{},""7"":{},""8"":{},""9"":{}},""daysOfWeek"":{""1"":{},""2"":{},""4"":{}}}`, - }, - } - - for _, s := range scenarios { - schedule, err := cron.NewSchedule(s.cronExpr) - - hasErr := err != nil - if hasErr != s.expectError { - t.Fatalf(""[%s] Expected hasErr to be %v, got %v (%v)"", s.cronExpr, s.expectError, hasErr, err) - } - - if hasErr { - continue - } - - encoded, err := json.Marshal(schedule) - if err != nil { - t.Fatalf(""[%s] Failed to marshalize the result schedule: %v"", s.cronExpr, err) - } - encodedStr := string(encoded) - - if encodedStr != s.expectSchedule { - t.Fatalf(""[%s] Expected \n%s, \ngot \n%s"", s.cronExpr, s.expectSchedule, encodedStr) - } - } -} - -func TestScheduleIsDue(t *testing.T) { - scenarios := []struct { - cronExpr string - moment *cron.Moment - expected bool - }{ - { - ""* * * * *"", - &cron.Moment{}, - false, - }, - { - ""* * * * *"", - &cron.Moment{ - Minute: 1, - Hour: 1, - Day: 1, - Month: 1, - DayOfWeek: 1, - }, - true, - }, - { - ""5 * * * *"", - &cron.Moment{ - Minute: 1, - Hour: 1, - Day: 1, - Month: 1, - DayOfWeek: 1, - }, - false, - }, - { - ""5 * * * *"", - &cron.Moment{ - Minute: 5, - Hour: 1, - Day: 1, - Month: 1, - DayOfWeek: 1, - }, - true, - }, - { - ""* 2-6 * * 2,3"", - &cron.Moment{ - Minute: 1, - Hour: 2, - Day: 1, - Month: 1, - DayOfWeek: 1, - }, - false, - }, - { - ""* 2-6 * * 2,3"", - &cron.Moment{ - Minute: 1, - Hour: 2, - Day: 1, - Month: 1, - DayOfWeek: 3, - }, - true, - }, - { - ""* * 1,2,5,15-18 * *"", - &cron.Moment{ - Minute: 1, - Hour: 1, - Day: 6, - Month: 1, - DayOfWeek: 1, - }, - false, - }, - { - ""* * 1,2,5,15-18/2 * *"", - &cron.Moment{ - Minute: 1, - Hour: 1, - Day: 2, - Month: 1, - DayOfWeek: 1, - }, - true, - }, - { - ""* * 1,2,5,15-18/2 * *"", - &cron.Moment{ - Minute: 1, - Hour: 1, - Day: 18, - Month: 1, - DayOfWeek: 1, - }, - false, - }, - { - ""* * 1,2,5,15-18/2 * *"", - &cron.Moment{ - Minute: 1, - Hour: 1, - Day: 17, - Month: 1, - DayOfWeek: 1, - }, - true, - }, - } - - for i, s := range scenarios { - schedule, err := cron.NewSchedule(s.cronExpr) - if err != nil { - t.Fatalf(""[%d-%s] Unexpected cron error: %v"", i, s.cronExpr, err) - } - - result := schedule.IsDue(s.moment) - - if result != s.expected { - t.Fatalf(""[%d-%s] Expected %v, got %v"", i, s.cronExpr, s.expected, result) - } - } -} diff --git a/internal/cron/spec.go b/internal/cron/spec.go new file mode 100644 index 0000000000000..fa1e241e5fb57 --- /dev/null +++ b/internal/cron/spec.go @@ -0,0 +1,188 @@ +package cron + +import ""time"" + +// SpecSchedule specifies a duty cycle (to the second granularity), based on a +// traditional crontab specification. It is computed initially and stored as bit sets. +type SpecSchedule struct { + Second, Minute, Hour, Dom, Month, Dow uint64 + + // Override location for this schedule. + Location *time.Location +} + +// bounds provides a range of acceptable values (plus a map of name to value). +type bounds struct { + min, max uint + names map[string]uint +} + +// The bounds for each field. +var ( + seconds = bounds{0, 59, nil} + minutes = bounds{0, 59, nil} + hours = bounds{0, 23, nil} + dom = bounds{1, 31, nil} + months = bounds{1, 12, map[string]uint{ + ""jan"": 1, + ""feb"": 2, + ""mar"": 3, + ""apr"": 4, + ""may"": 5, + ""jun"": 6, + ""jul"": 7, + ""aug"": 8, + ""sep"": 9, + ""oct"": 10, + ""nov"": 11, + ""dec"": 12, + }} + dow = bounds{0, 6, map[string]uint{ + ""sun"": 0, + ""mon"": 1, + ""tue"": 2, + ""wed"": 3, + ""thu"": 4, + ""fri"": 5, + ""sat"": 6, + }} +) + +const ( + // Set the top bit if a star was included in the expression. + starBit = 1 << 63 +) + +// Next returns the next time this schedule is activated, greater than the given +// time. If no time can be found to satisfy the schedule, return the zero time. +func (s *SpecSchedule) Next(t time.Time) time.Time { + // General approach + // + // For Month, Day, Hour, Minute, Second: + // Check if the time value matches. If yes, continue to the next field. + // If the field doesn't match the schedule, then increment the field until it matches. + // While incrementing the field, a wrap-around brings it back to the beginning + // of the field list (since it is necessary to re-verify previous field + // values) + + // Convert the given time into the schedule's timezone, if one is specified. + // Save the original timezone so we can convert back after we find a time. + // Note that schedules without a time zone specified (time.Local) are treated + // as local to the time provided. + origLocation := t.Location() + loc := s.Location + if loc == time.Local { + loc = t.Location() + } + if s.Location != time.Local { + t = t.In(s.Location) + } + + // Start at the earliest possible time (the upcoming second). + t = t.Add(1*time.Second - time.Duration(t.Nanosecond())*time.Nanosecond) + + // This flag indicates whether a field has been incremented. + added := false + + // If no time is found within five years, return zero. + yearLimit := t.Year() + 5 + +WRAP: + if t.Year() > yearLimit { + return time.Time{} + } + + // Find the first applicable month. + // If it's this month, then do nothing. + for 1< 12 { + t = t.Add(time.Duration(24-t.Hour()) * time.Hour) + } else { + t = t.Add(time.Duration(-t.Hour()) * time.Hour) + } + } + + if t.Day() == 1 { + goto WRAP + } + } + + for 1< 0 + dowMatch bool = 1< 0 + ) + if s.Dom&starBit > 0 || s.Dow&starBit > 0 { + return domMatch && dowMatch + } + return domMatch || dowMatch +} diff --git a/internal/cron/spec_test.go b/internal/cron/spec_test.go new file mode 100644 index 0000000000000..1b8a503e409e5 --- /dev/null +++ b/internal/cron/spec_test.go @@ -0,0 +1,300 @@ +package cron + +import ( + ""strings"" + ""testing"" + ""time"" +) + +func TestActivation(t *testing.T) { + tests := []struct { + time, spec string + expected bool + }{ + // Every fifteen minutes. + {""Mon Jul 9 15:00 2012"", ""0/15 * * * *"", true}, + {""Mon Jul 9 15:45 2012"", ""0/15 * * * *"", true}, + {""Mon Jul 9 15:40 2012"", ""0/15 * * * *"", false}, + + // Every fifteen minutes, starting at 5 minutes. + {""Mon Jul 9 15:05 2012"", ""5/15 * * * *"", true}, + {""Mon Jul 9 15:20 2012"", ""5/15 * * * *"", true}, + {""Mon Jul 9 15:50 2012"", ""5/15 * * * *"", true}, + + // Named months + {""Sun Jul 15 15:00 2012"", ""0/15 * * Jul *"", true}, + {""Sun Jul 15 15:00 2012"", ""0/15 * * Jun *"", false}, + + // Everything set. + {""Sun Jul 15 08:30 2012"", ""30 08 ? Jul Sun"", true}, + {""Sun Jul 15 08:30 2012"", ""30 08 15 Jul ?"", true}, + {""Mon Jul 16 08:30 2012"", ""30 08 ? Jul Sun"", false}, + {""Mon Jul 16 08:30 2012"", ""30 08 15 Jul ?"", false}, + + // Predefined schedules + {""Mon Jul 9 15:00 2012"", ""@hourly"", true}, + {""Mon Jul 9 15:04 2012"", ""@hourly"", false}, + {""Mon Jul 9 15:00 2012"", ""@daily"", false}, + {""Mon Jul 9 00:00 2012"", ""@daily"", true}, + {""Mon Jul 9 00:00 2012"", ""@weekly"", false}, + {""Sun Jul 8 00:00 2012"", ""@weekly"", true}, + {""Sun Jul 8 01:00 2012"", ""@weekly"", false}, + {""Sun Jul 8 00:00 2012"", ""@monthly"", false}, + {""Sun Jul 1 00:00 2012"", ""@monthly"", true}, + + // Test interaction of DOW and DOM. + // If both are restricted, then only one needs to match. + {""Sun Jul 15 00:00 2012"", ""* * 1,15 * Sun"", true}, + {""Fri Jun 15 00:00 2012"", ""* * 1,15 * Sun"", true}, + {""Wed Aug 1 00:00 2012"", ""* * 1,15 * Sun"", true}, + {""Sun Jul 15 00:00 2012"", ""* * */10 * Sun"", true}, // verifies #70 + + // However, if one has a star, then both need to match. + {""Sun Jul 15 00:00 2012"", ""* * * * Mon"", false}, + {""Mon Jul 9 00:00 2012"", ""* * 1,15 * *"", false}, + {""Sun Jul 15 00:00 2012"", ""* * 1,15 * *"", true}, + {""Sun Jul 15 00:00 2012"", ""* * */2 * Sun"", true}, + } + + for _, test := range tests { + sched, err := ParseStandard(test.spec) + if err != nil { + t.Error(err) + continue + } + actual := sched.Next(getTime(test.time).Add(-1 * time.Second)) + expected := getTime(test.time) + if test.expected && expected != actual || !test.expected && expected == actual { + t.Errorf(""Fail evaluating %s on %s: (expected) %s != %s (actual)"", + test.spec, test.time, expected, actual) + } + } +} + +func TestNext(t *testing.T) { + runs := []struct { + time, spec string + expected string + }{ + // Simple cases + {""Mon Jul 9 14:45 2012"", ""0 0/15 * * * *"", ""Mon Jul 9 15:00 2012""}, + {""Mon Jul 9 14:59 2012"", ""0 0/15 * * * *"", ""Mon Jul 9 15:00 2012""}, + {""Mon Jul 9 14:59:59 2012"", ""0 0/15 * * * *"", ""Mon Jul 9 15:00 2012""}, + + // Wrap around hours + {""Mon Jul 9 15:45 2012"", ""0 20-35/15 * * * *"", ""Mon Jul 9 16:20 2012""}, + + // Wrap around days + {""Mon Jul 9 23:46 2012"", ""0 */15 * * * *"", ""Tue Jul 10 00:00 2012""}, + {""Mon Jul 9 23:45 2012"", ""0 20-35/15 * * * *"", ""Tue Jul 10 00:20 2012""}, + {""Mon Jul 9 23:35:51 2012"", ""15/35 20-35/15 * * * *"", ""Tue Jul 10 00:20:15 2012""}, + {""Mon Jul 9 23:35:51 2012"", ""15/35 20-35/15 1/2 * * *"", ""Tue Jul 10 01:20:15 2012""}, + {""Mon Jul 9 23:35:51 2012"", ""15/35 20-35/15 10-12 * * *"", ""Tue Jul 10 10:20:15 2012""}, + + {""Mon Jul 9 23:35:51 2012"", ""15/35 20-35/15 1/2 */2 * *"", ""Thu Jul 11 01:20:15 2012""}, + {""Mon Jul 9 23:35:51 2012"", ""15/35 20-35/15 * 9-20 * *"", ""Wed Jul 10 00:20:15 2012""}, + {""Mon Jul 9 23:35:51 2012"", ""15/35 20-35/15 * 9-20 Jul *"", ""Wed Jul 10 00:20:15 2012""}, + + // Wrap around months + {""Mon Jul 9 23:35 2012"", ""0 0 0 9 Apr-Oct ?"", ""Thu Aug 9 00:00 2012""}, + {""Mon Jul 9 23:35 2012"", ""0 0 0 */5 Apr,Aug,Oct Mon"", ""Tue Aug 1 00:00 2012""}, + {""Mon Jul 9 23:35 2012"", ""0 0 0 */5 Oct Mon"", ""Mon Oct 1 00:00 2012""}, + + // Wrap around years + {""Mon Jul 9 23:35 2012"", ""0 0 0 * Feb Mon"", ""Mon Feb 4 00:00 2013""}, + {""Mon Jul 9 23:35 2012"", ""0 0 0 * Feb Mon/2"", ""Fri Feb 1 00:00 2013""}, + + // Wrap around minute, hour, day, month, and year + {""Mon Dec 31 23:59:45 2012"", ""0 * * * * *"", ""Tue Jan 1 00:00:00 2013""}, + + // Leap year + {""Mon Jul 9 23:35 2012"", ""0 0 0 29 Feb ?"", ""Mon Feb 29 00:00 2016""}, + + // Daylight savings time 2am EST (-5) -> 3am EDT (-4) + {""2012-03-11T00:00:00-0500"", ""TZ=America/New_York 0 30 2 11 Mar ?"", ""2013-03-11T02:30:00-0400""}, + + // hourly job + {""2012-03-11T00:00:00-0500"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T01:00:00-0500""}, + {""2012-03-11T01:00:00-0500"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T03:00:00-0400""}, + {""2012-03-11T03:00:00-0400"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T04:00:00-0400""}, + {""2012-03-11T04:00:00-0400"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T05:00:00-0400""}, + + // hourly job using CRON_TZ + {""2012-03-11T00:00:00-0500"", ""CRON_TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T01:00:00-0500""}, + {""2012-03-11T01:00:00-0500"", ""CRON_TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T03:00:00-0400""}, + {""2012-03-11T03:00:00-0400"", ""CRON_TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T04:00:00-0400""}, + {""2012-03-11T04:00:00-0400"", ""CRON_TZ=America/New_York 0 0 * * * ?"", ""2012-03-11T05:00:00-0400""}, + + // 1am nightly job + {""2012-03-11T00:00:00-0500"", ""TZ=America/New_York 0 0 1 * * ?"", ""2012-03-11T01:00:00-0500""}, + {""2012-03-11T01:00:00-0500"", ""TZ=America/New_York 0 0 1 * * ?"", ""2012-03-12T01:00:00-0400""}, + + // 2am nightly job (skipped) + {""2012-03-11T00:00:00-0500"", ""TZ=America/New_York 0 0 2 * * ?"", ""2012-03-12T02:00:00-0400""}, + + // Daylight savings time 2am EDT (-4) => 1am EST (-5) + {""2012-11-04T00:00:00-0400"", ""TZ=America/New_York 0 30 2 04 Nov ?"", ""2012-11-04T02:30:00-0500""}, + {""2012-11-04T01:45:00-0400"", ""TZ=America/New_York 0 30 1 04 Nov ?"", ""2012-11-04T01:30:00-0500""}, + + // hourly job + {""2012-11-04T00:00:00-0400"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-11-04T01:00:00-0400""}, + {""2012-11-04T01:00:00-0400"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-11-04T01:00:00-0500""}, + {""2012-11-04T01:00:00-0500"", ""TZ=America/New_York 0 0 * * * ?"", ""2012-11-04T02:00:00-0500""}, + + // 1am nightly job (runs twice) + {""2012-11-04T00:00:00-0400"", ""TZ=America/New_York 0 0 1 * * ?"", ""2012-11-04T01:00:00-0400""}, + {""2012-11-04T01:00:00-0400"", ""TZ=America/New_York 0 0 1 * * ?"", ""2012-11-04T01:00:00-0500""}, + {""2012-11-04T01:00:00-0500"", ""TZ=America/New_York 0 0 1 * * ?"", ""2012-11-05T01:00:00-0500""}, + + // 2am nightly job + {""2012-11-04T00:00:00-0400"", ""TZ=America/New_York 0 0 2 * * ?"", ""2012-11-04T02:00:00-0500""}, + {""2012-11-04T02:00:00-0500"", ""TZ=America/New_York 0 0 2 * * ?"", ""2012-11-05T02:00:00-0500""}, + + // 3am nightly job + {""2012-11-04T00:00:00-0400"", ""TZ=America/New_York 0 0 3 * * ?"", ""2012-11-04T03:00:00-0500""}, + {""2012-11-04T03:00:00-0500"", ""TZ=America/New_York 0 0 3 * * ?"", ""2012-11-05T03:00:00-0500""}, + + // hourly job + {""TZ=America/New_York 2012-11-04T00:00:00-0400"", ""0 0 * * * ?"", ""2012-11-04T01:00:00-0400""}, + {""TZ=America/New_York 2012-11-04T01:00:00-0400"", ""0 0 * * * ?"", ""2012-11-04T01:00:00-0500""}, + {""TZ=America/New_York 2012-11-04T01:00:00-0500"", ""0 0 * * * ?"", ""2012-11-04T02:00:00-0500""}, + + // 1am nightly job (runs twice) + {""TZ=America/New_York 2012-11-04T00:00:00-0400"", ""0 0 1 * * ?"", ""2012-11-04T01:00:00-0400""}, + {""TZ=America/New_York 2012-11-04T01:00:00-0400"", ""0 0 1 * * ?"", ""2012-11-04T01:00:00-0500""}, + {""TZ=America/New_York 2012-11-04T01:00:00-0500"", ""0 0 1 * * ?"", ""2012-11-05T01:00:00-0500""}, + + // 2am nightly job + {""TZ=America/New_York 2012-11-04T00:00:00-0400"", ""0 0 2 * * ?"", ""2012-11-04T02:00:00-0500""}, + {""TZ=America/New_York 2012-11-04T02:00:00-0500"", ""0 0 2 * * ?"", ""2012-11-05T02:00:00-0500""}, + + // 3am nightly job + {""TZ=America/New_York 2012-11-04T00:00:00-0400"", ""0 0 3 * * ?"", ""2012-11-04T03:00:00-0500""}, + {""TZ=America/New_York 2012-11-04T03:00:00-0500"", ""0 0 3 * * ?"", ""2012-11-05T03:00:00-0500""}, + + // Unsatisfiable + {""Mon Jul 9 23:35 2012"", ""0 0 0 30 Feb ?"", """"}, + {""Mon Jul 9 23:35 2012"", ""0 0 0 31 Apr ?"", """"}, + + // Monthly job + {""TZ=America/New_York 2012-11-04T00:00:00-0400"", ""0 0 3 3 * ?"", ""2012-12-03T03:00:00-0500""}, + + // Test the scenario of DST resulting in midnight not being a valid time. + // https://github.com/robfig/cron/issues/157 + {""2018-10-17T05:00:00-0400"", ""TZ=America/Sao_Paulo 0 0 9 10 * ?"", ""2018-11-10T06:00:00-0500""}, + {""2018-02-14T05:00:00-0500"", ""TZ=America/Sao_Paulo 0 0 9 22 * ?"", ""2018-02-22T07:00:00-0500""}, + } + + for _, c := range runs { + sched, err := secondParser.Parse(c.spec) + if err != nil { + t.Error(err) + continue + } + actual := sched.Next(getTime(c.time)) + expected := getTime(c.expected) + if !actual.Equal(expected) { + t.Errorf(""%s, \""%s\"": (expected) %v != %v (actual)"", c.time, c.spec, expected, actual) + } + } +} + +func TestErrors(t *testing.T) { + invalidSpecs := []string{ + ""xyz"", + ""60 0 * * *"", + ""0 60 * * *"", + ""0 0 * * XYZ"", + } + for _, spec := range invalidSpecs { + _, err := ParseStandard(spec) + if err == nil { + t.Error(""expected an error parsing: "", spec) + } + } +} + +func getTime(value string) time.Time { + if value == """" { + return time.Time{} + } + + var location = time.Local + if strings.HasPrefix(value, ""TZ="") { + parts := strings.Fields(value) + loc, err := time.LoadLocation(parts[0][len(""TZ=""):]) + if err != nil { + panic(""could not parse location:"" + err.Error()) + } + location = loc + value = parts[1] + } + + var layouts = []string{ + ""Mon Jan 2 15:04 2006"", + ""Mon Jan 2 15:04:05 2006"", + } + for _, layout := range layouts { + if t, err := time.ParseInLocation(layout, value, location); err == nil { + return t + } + } + if t, err := time.ParseInLocation(""2006-01-02T15:04:05-0700"", value, location); err == nil { + return t + } + panic(""could not parse time value "" + value) +} + +func TestNextWithTz(t *testing.T) { + runs := []struct { + time, spec string + expected string + }{ + // Failing tests + {""2016-01-03T13:09:03+0530"", ""14 14 * * *"", ""2016-01-03T14:14:00+0530""}, + {""2016-01-03T04:09:03+0530"", ""14 14 * * ?"", ""2016-01-03T14:14:00+0530""}, + + // Passing tests + {""2016-01-03T14:09:03+0530"", ""14 14 * * *"", ""2016-01-03T14:14:00+0530""}, + {""2016-01-03T14:00:00+0530"", ""14 14 * * ?"", ""2016-01-03T14:14:00+0530""}, + } + for _, c := range runs { + sched, err := ParseStandard(c.spec) + if err != nil { + t.Error(err) + continue + } + actual := sched.Next(getTimeTZ(c.time)) + expected := getTimeTZ(c.expected) + if !actual.Equal(expected) { + t.Errorf(""%s, \""%s\"": (expected) %v != %v (actual)"", c.time, c.spec, expected, actual) + } + } +} + +func getTimeTZ(value string) time.Time { + if value == """" { + return time.Time{} + } + t, err := time.Parse(""Mon Jan 2 15:04 2006"", value) + if err != nil { + t, err = time.Parse(""Mon Jan 2 15:04:05 2006"", value) + if err != nil { + t, err = time.Parse(""2006-01-02T15:04:05-0700"", value) + if err != nil { + panic(err) + } + } + } + + return t +} + +// https://github.com/robfig/cron/issues/144 +func TestSlash0NoHang(t *testing.T) { + schedule := ""TZ=America/New_York 15/0 * * * *"" + _, err := ParseStandard(schedule) + if err == nil { + t.Error(""expected an error on 0 increment"") + } +}",chore,update cron package 03267d6d37c79fe077c14df0739ecfedda1dc799,2025-02-04 18:34:36,RoccoSmit,feat: search for multiple words (#4362),False,"diff --git a/web/src/components/SearchBar.tsx b/web/src/components/SearchBar.tsx index 39eb0bc553a1b..a3fdb806eb6fc 100644 --- a/web/src/components/SearchBar.tsx +++ b/web/src/components/SearchBar.tsx @@ -17,10 +17,12 @@ const SearchBar = () => { if (e.key === ""Enter"") { e.preventDefault(); if (queryText !== """") { - memoFilterStore.removeFilter((f) => f.factor === ""contentSearch""); - memoFilterStore.addFilter({ - factor: ""contentSearch"", - value: queryText, + const words = queryText.split("" ""); + words.forEach((word) => { + memoFilterStore.addFilter({ + factor: ""contentSearch"", + value: word, + }); }); setQueryText(""""); }",feat,search for multiple words (#4362) eb72609ea3258bc7c5cd07d4afa4c3497896345e,2024-01-20 18:22:11,Steven,chore: update memo editor cache key,False,"diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx index d69fd648a97a5..0605970ade393 100644 --- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx +++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx @@ -1,4 +1,5 @@ import { useContext, useEffect } from ""react""; +import MemoResourceListView from ""@/components/MemoResourceListView""; import useLoading from ""@/hooks/useLoading""; import { useMemoStore } from ""@/store/v1""; import MemoContent from ""..""; @@ -33,7 +34,12 @@ const EmbeddedMemo = ({ memoId }: Props) => { // Add the memo to the set of embedded memos. This is used to prevent infinite loops when a memo embeds itself. context.embeddedMemos.add(resourceName); - return ; + return ( +
+ + +
+ ); }; export default EmbeddedMemo; diff --git a/web/src/components/MemoEditor/MemoEditorDialog.tsx b/web/src/components/MemoEditor/MemoEditorDialog.tsx index 736d0bde849c8..448a4c86a6dbc 100644 --- a/web/src/components/MemoEditor/MemoEditorDialog.tsx +++ b/web/src/components/MemoEditor/MemoEditorDialog.tsx @@ -8,10 +8,11 @@ import Icon from ""../Icon""; interface Props extends DialogProps { memoId?: number; + cacheKey?: string; relationList?: MemoRelation[]; } -const MemoEditorDialog: React.FC = ({ memoId, relationList, destroy }: Props) => { +const MemoEditorDialog: React.FC = ({ memoId, cacheKey, relationList, destroy }: Props) => { const globalStore = useGlobalStore(); const tagStore = useTagStore(); const { systemStatus } = globalStore.state; @@ -26,10 +27,10 @@ const MemoEditorDialog: React.FC = ({ memoId, relationList, destroy }: Pr return ( <> -
+
- -

{systemStatus.customizedProfile.name}

+ +

{systemStatus.customizedProfile.name}

@@ -38,7 +39,7 @@ const MemoEditorDialog: React.FC = ({ memoId, relationList, destroy }: Pr
= ({ memoId, relationList, destroy }: Pr ); }; -export default function showMemoEditorDialog(props: Pick = {}): void { +export default function showMemoEditorDialog(props: Pick = {}): void { generateDialog( { className: ""memo-editor-dialog"", diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index d13797476aff1..08eae64f99380 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -106,6 +106,7 @@ const MemoView: React.FC = (props: Props) => { const handleEditMemoClick = () => { showMemoEditorDialog({ memoId: memo.id, + cacheKey: `${memo.id}-${memo.updateTime}`, }); }; diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx index a7a0d1fb734d0..7169085561d5a 100644 --- a/web/src/pages/MemoDetail.tsx +++ b/web/src/pages/MemoDetail.tsx @@ -95,6 +95,7 @@ const MemoDetail = () => { const handleEditMemoClick = () => { showMemoEditorDialog({ memoId: memo.id, + cacheKey: `${memo.id}-${memo.updateTime}`, }); };",chore,update memo editor cache key 29b540ade3d514828def0605cd28092a1522b5cd,2023-12-22 17:17:46,Steven,chore: fix fetch memos,False,"diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx index 818a53fb31324..b1d549be899ae 100644 --- a/web/src/pages/Archived.tsx +++ b/web/src/pages/Archived.tsx @@ -8,6 +8,7 @@ import MemoContent from ""@/components/MemoContent""; import MobileHeader from ""@/components/MobileHeader""; import { memoServiceClient } from ""@/grpcweb""; import { getDateTimeString } from ""@/helpers/datetime""; +import useCurrentUser from ""@/hooks/useCurrentUser""; import useLoading from ""@/hooks/useLoading""; import { useMemoV1Store } from ""@/store/v1""; import { RowStatus } from ""@/types/proto/api/v2/common""; @@ -17,13 +18,14 @@ import { useTranslate } from ""@/utils/i18n""; const Archived = () => { const t = useTranslate(); const loadingState = useLoading(); + const user = useCurrentUser(); const memoStore = useMemoV1Store(); const [archivedMemos, setArchivedMemos] = useState([]); useEffect(() => { memoServiceClient .listMemos({ - filter: ""row_status == 'ARCHIVED'"", + filter: [`creator == ""${user.name}""`, ""row_status == 'ARCHIVED'""].join("" && ""), }) .then(({ memos }) => { setArchivedMemos(memos); diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx index 880197f4e091e..c4e0da18f1e34 100644 --- a/web/src/pages/Explore.tsx +++ b/web/src/pages/Explore.tsx @@ -16,8 +16,8 @@ const Explore = () => { const filterStore = useFilterStore(); const memoStore = useMemoV1Store(); const memoList = useMemoList(); + const [isRequesting, setIsRequesting] = useState(true); const [isComplete, setIsComplete] = useState(false); - const [isRequesting, setIsRequesting] = useState(false); const { tag: tagQuery, text: textQuery } = filterStore.state; const sortedMemos = memoList.value.sort((a, b) => getTimeStampByDate(b.displayTime) - getTimeStampByDate(a.displayTime)); diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index 6d33cf80759a3..bb3b799c0fd4a 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -20,9 +20,9 @@ const Home = () => { const user = useCurrentUser(); const filterStore = useFilterStore(); const memoStore = useMemoV1Store(); - const [isComplete, setIsComplete] = useState(false); - const [isRequesting, setIsRequesting] = useState(false); const memoList = useMemoList(); + const [isRequesting, setIsRequesting] = useState(true); + const [isComplete, setIsComplete] = useState(false); const { tag: tagQuery, text: textQuery } = filterStore.state; const sortedMemos = memoList.value .sort((a, b) => getTimeStampByDate(b.displayTime) - getTimeStampByDate(a.displayTime)) diff --git a/web/src/pages/Timeline.tsx b/web/src/pages/Timeline.tsx index f1836fb9ff8d1..7dbdf277989ec 100644 --- a/web/src/pages/Timeline.tsx +++ b/web/src/pages/Timeline.tsx @@ -15,25 +15,34 @@ import { useTranslate } from ""@/utils/i18n""; const Timeline = () => { const t = useTranslate(); - const currentUser = useCurrentUser(); + const user = useCurrentUser(); const memoStore = useMemoV1Store(); const memoList = useMemoList(); const currentDateStamp = getDateStampByDate(getNormalizedDateString()) as number; const [selectedDateStamp, setSelectedDateStamp] = useState(currentDateStamp as number); + const [isRequesting, setIsRequesting] = useState(true); const [showDatePicker, toggleShowDatePicker] = useToggle(false); const sortedMemos = memoList.value.sort((a, b) => getTimeStampByDate(a.createTime) - getTimeStampByDate(b.createTime)); useEffect(() => { memoList.reset(); + fetchMemos(); + }, [selectedDateStamp]); + + const fetchMemos = async () => { const filters = [ - `creator == ""${currentUser.name}""`, + `creator == ""${user.name}""`, + `row_status == ""NORMAL""`, `created_ts_after == ${selectedDateStamp / 1000}`, `created_ts_before == ${(selectedDateStamp + DAILY_TIMESTAMP) / 1000}`, ]; - memoStore.fetchMemos({ + setIsRequesting(true); + await memoStore.fetchMemos({ + offset: memoList.size(), filter: filters.join("" && ""), }); - }, [selectedDateStamp]); + setIsRequesting(false); + }; const handleDataPickerChange = (datestamp: number): void => { setSelectedDateStamp(datestamp); @@ -73,12 +82,6 @@ const Timeline = () => { />
- {sortedMemos.length === 0 && ( -
- -

{t(""message.no-data"")}

-
- )}
{sortedMemos.map((memo, index) => (
{
)}
+ {!isRequesting && sortedMemos.length === 0 && ( +
+ +

{t(""message.no-data"")}

+
+ )}
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx index d584742954840..fd6f4b2a5dff4 100644 --- a/web/src/pages/UserProfile.tsx +++ b/web/src/pages/UserProfile.tsx @@ -6,10 +6,10 @@ import MemoView from ""@/components/MemoView""; import MobileHeader from ""@/components/MobileHeader""; import UserAvatar from ""@/components/UserAvatar""; import { DEFAULT_MEMO_LIMIT } from ""@/helpers/consts""; +import { getTimeStampByDate } from ""@/helpers/datetime""; import useLoading from ""@/hooks/useLoading""; import { useFilterStore } from ""@/store/module""; -import { useMemoV1Store, useUserV1Store } from ""@/store/v1""; -import { Memo } from ""@/types/proto/api/v2/memo_service""; +import { useMemoList, useMemoV1Store, useUserV1Store } from ""@/store/v1""; import { User } from ""@/types/proto/api/v2/user_service""; import { useTranslate } from ""@/utils/i18n""; @@ -21,10 +21,13 @@ const UserProfile = () => { const [user, setUser] = useState(); const filterStore = useFilterStore(); const memoStore = useMemoV1Store(); - const [memos, setMemos] = useState([]); + const memoList = useMemoList(); + const [isRequesting, setIsRequesting] = useState(true); const [isComplete, setIsComplete] = useState(false); - const [isRequesting, setIsRequesting] = useState(false); const { tag: tagQuery, text: textQuery } = filterStore.state; + const sortedMemos = memoList.value + .sort((a, b) => getTimeStampByDate(b.displayTime) - getTimeStampByDate(a.displayTime)) + .sort((a, b) => Number(b.pinned) - Number(a.pinned)); useEffect(() => { const username = params.username; @@ -45,6 +48,7 @@ const UserProfile = () => { }, [params.username]); useEffect(() => { + memoList.reset(); fetchMemos(); }, [tagQuery, textQuery]); @@ -54,16 +58,23 @@ const UserProfile = () => { } const filters = [`creator == ""${user.name}""`, `row_status == ""NORMAL""`]; - if (tagQuery) filters.push(`tags == ""${tagQuery}""`); - if (textQuery) filters.push(`content_search == ""${textQuery}""`); + const contentSearch: string[] = []; + if (tagQuery) { + contentSearch.push(`""#${tagQuery}""`); + } + if (textQuery) { + contentSearch.push(`""${textQuery}""`); + } + if (contentSearch.length > 0) { + filters.push(`content_search == [${contentSearch.join("", "")}]`); + } setIsRequesting(true); const data = await memoStore.fetchMemos({ limit: DEFAULT_MEMO_LIMIT, - offset: memos.length, + offset: memoList.size(), filter: filters.join("" && ""), }); setIsRequesting(false); - setMemos([...memos, ...data]); setIsComplete(data.length < DEFAULT_MEMO_LIMIT); }; @@ -78,16 +89,15 @@ const UserProfile = () => {

{user?.nickname}

- {memos.map((memo) => ( + {sortedMemos.map((memo) => ( ))} - {isRequesting && ( + {isRequesting ? (

{t(""memo.fetching-data"")}

- )} - {isComplete ? ( - memos.length === 0 && ( + ) : isComplete ? ( + sortedMemos.length === 0 && (

{t(""message.no-data"")}

",chore,fix fetch memos 771c56f48548e7176e9ba78bd7ee5da86eb407ce,2023-01-07 11:37:17,boojack,chore: fix renderer (#917),False,"diff --git a/web/src/labs/marked/parser/BoldEmphasis.tsx b/web/src/labs/marked/parser/BoldEmphasis.tsx index 66b6eea4dd4a1..a5ccfbedd2277 100644 --- a/web/src/labs/marked/parser/BoldEmphasis.tsx +++ b/web/src/labs/marked/parser/BoldEmphasis.tsx @@ -14,7 +14,7 @@ const renderer = (rawStr: string) => { const parsedContent = marked(matchResult[1], [], [Link, PlainText]); return ( - ${parsedContent} + {parsedContent} ); }; diff --git a/web/src/labs/marked/parser/UnorderedList.tsx b/web/src/labs/marked/parser/UnorderedList.tsx index 595d6e1e170c7..bd7ff76c1be80 100644 --- a/web/src/labs/marked/parser/UnorderedList.tsx +++ b/web/src/labs/marked/parser/UnorderedList.tsx @@ -14,7 +14,7 @@ const renderer = (rawStr: string) => { return (

• - ${parsedContent} + {parsedContent}

); };",chore,fix renderer (#917) ea881338a9fc6740580ab794c84973872e27bf1c,2024-09-22 18:45:46,Steven,chore: add gradient block to compact mode,False,"diff --git a/web/src/components/MemoContent/index.tsx b/web/src/components/MemoContent/index.tsx index 0519db1145c69..201a857427e54 100644 --- a/web/src/components/MemoContent/index.tsx +++ b/web/src/components/MemoContent/index.tsx @@ -79,7 +79,7 @@ const MemoContent: React.FC = (props: Props) => {
= (props: Props) => { skipNextLineBreakFlag = true; return ; })} + {showCompactMode && ( +
+ )}
{showCompactMode && (
",chore,add gradient block to compact mode a8ea28066e4296d2e379887296660ad85cc3b205,2024-08-28 20:50:32,Steven,chore: retire export memos,False,"diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yaml index 738702f3f2929..033b14658abbc 100644 --- a/docs/apidocs.swagger.yaml +++ b/docs/apidocs.swagger.yaml @@ -356,27 +356,6 @@ paths: type: string tags: - MemoService - /api/v1/memos:export: - post: - summary: ExportMemos exports memos. - operationId: MemoService_ExportMemos - responses: - ""200"": - description: A successful response. - schema: - $ref: '#/definitions/v1ExportMemosResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: body - in: body - required: true - schema: - $ref: '#/definitions/v1ExportMemosRequest' - tags: - - MemoService /api/v1/reactions/{reactionId}: delete: summary: DeleteMemoReaction deletes a reaction for a memo. @@ -2381,18 +2360,6 @@ definitions: properties: symbol: type: string - v1ExportMemosRequest: - type: object - properties: - filter: - type: string - title: Same as ListMemosRequest.filter - v1ExportMemosResponse: - type: object - properties: - content: - type: string - format: byte v1HTMLElementNode: type: object properties: diff --git a/proto/api/v1/memo_service.proto b/proto/api/v1/memo_service.proto index 861b7b4ecdfd5..8f672e0b14fa4 100644 --- a/proto/api/v1/memo_service.proto +++ b/proto/api/v1/memo_service.proto @@ -51,13 +51,6 @@ service MemoService { option (google.api.http) = {delete: ""/api/v1/{name=memos/*}""}; option (google.api.method_signature) = ""name""; } - // ExportMemos exports memos. - rpc ExportMemos(ExportMemosRequest) returns (ExportMemosResponse) { - option (google.api.http) = { - post: ""/api/v1/memos:export"" - body: ""*"" - }; - } // ListMemoProperties lists memo properties. rpc ListMemoProperties(ListMemoPropertiesRequest) returns (ListMemoPropertiesResponse) { option (google.api.http) = {get: ""/api/v1/{name=memos/*}/properties""}; @@ -260,15 +253,6 @@ message DeleteMemoRequest { string name = 1; } -message ExportMemosRequest { - // Same as ListMemosRequest.filter - string filter = 1; -} - -message ExportMemosResponse { - bytes content = 1; -} - message ListMemoPropertiesRequest { // The name of the memo. // Format: memos/{id}. Use ""memos/-"" to list all properties. diff --git a/proto/gen/api/v1/memo_service.pb.go b/proto/gen/api/v1/memo_service.pb.go index aa21827cb58da..9b79472a492ab 100644 --- a/proto/gen/api/v1/memo_service.pb.go +++ b/proto/gen/api/v1/memo_service.pb.go @@ -738,101 +738,6 @@ func (x *DeleteMemoRequest) GetName() string { return """" } -type ExportMemosRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Same as ListMemosRequest.filter - Filter string `protobuf:""bytes,1,opt,name=filter,proto3"" json:""filter,omitempty""` -} - -func (x *ExportMemosRequest) Reset() { - *x = ExportMemosRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ExportMemosRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ExportMemosRequest) ProtoMessage() {} - -func (x *ExportMemosRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ExportMemosRequest.ProtoReflect.Descriptor instead. -func (*ExportMemosRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{9} -} - -func (x *ExportMemosRequest) GetFilter() string { - if x != nil { - return x.Filter - } - return """" -} - -type ExportMemosResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Content []byte `protobuf:""bytes,1,opt,name=content,proto3"" json:""content,omitempty""` -} - -func (x *ExportMemosResponse) Reset() { - *x = ExportMemosResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ExportMemosResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ExportMemosResponse) ProtoMessage() {} - -func (x *ExportMemosResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ExportMemosResponse.ProtoReflect.Descriptor instead. -func (*ExportMemosResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{10} -} - -func (x *ExportMemosResponse) GetContent() []byte { - if x != nil { - return x.Content - } - return nil -} - type ListMemoPropertiesRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -846,7 +751,7 @@ type ListMemoPropertiesRequest struct { func (x *ListMemoPropertiesRequest) Reset() { *x = ListMemoPropertiesRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[11] + mi := &file_api_v1_memo_service_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -859,7 +764,7 @@ func (x *ListMemoPropertiesRequest) String() string { func (*ListMemoPropertiesRequest) ProtoMessage() {} func (x *ListMemoPropertiesRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[11] + mi := &file_api_v1_memo_service_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -872,7 +777,7 @@ func (x *ListMemoPropertiesRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoPropertiesRequest.ProtoReflect.Descriptor instead. func (*ListMemoPropertiesRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{11} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{9} } func (x *ListMemoPropertiesRequest) GetName() string { @@ -893,7 +798,7 @@ type ListMemoPropertiesResponse struct { func (x *ListMemoPropertiesResponse) Reset() { *x = ListMemoPropertiesResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[12] + mi := &file_api_v1_memo_service_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -906,7 +811,7 @@ func (x *ListMemoPropertiesResponse) String() string { func (*ListMemoPropertiesResponse) ProtoMessage() {} func (x *ListMemoPropertiesResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[12] + mi := &file_api_v1_memo_service_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -919,7 +824,7 @@ func (x *ListMemoPropertiesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoPropertiesResponse.ProtoReflect.Descriptor instead. func (*ListMemoPropertiesResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{12} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{10} } func (x *ListMemoPropertiesResponse) GetEntities() []*MemoPropertyEntity { @@ -944,7 +849,7 @@ type MemoPropertyEntity struct { func (x *MemoPropertyEntity) Reset() { *x = MemoPropertyEntity{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[13] + mi := &file_api_v1_memo_service_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -957,7 +862,7 @@ func (x *MemoPropertyEntity) String() string { func (*MemoPropertyEntity) ProtoMessage() {} func (x *MemoPropertyEntity) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[13] + mi := &file_api_v1_memo_service_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -970,7 +875,7 @@ func (x *MemoPropertyEntity) ProtoReflect() protoreflect.Message { // Deprecated: Use MemoPropertyEntity.ProtoReflect.Descriptor instead. func (*MemoPropertyEntity) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{13} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{11} } func (x *MemoPropertyEntity) GetName() string { @@ -1007,7 +912,7 @@ type RebuildMemoPropertyRequest struct { func (x *RebuildMemoPropertyRequest) Reset() { *x = RebuildMemoPropertyRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[14] + mi := &file_api_v1_memo_service_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1020,7 +925,7 @@ func (x *RebuildMemoPropertyRequest) String() string { func (*RebuildMemoPropertyRequest) ProtoMessage() {} func (x *RebuildMemoPropertyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[14] + mi := &file_api_v1_memo_service_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1033,7 +938,7 @@ func (x *RebuildMemoPropertyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RebuildMemoPropertyRequest.ProtoReflect.Descriptor instead. func (*RebuildMemoPropertyRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{14} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{12} } func (x *RebuildMemoPropertyRequest) GetName() string { @@ -1059,7 +964,7 @@ type ListMemoTagsRequest struct { func (x *ListMemoTagsRequest) Reset() { *x = ListMemoTagsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[15] + mi := &file_api_v1_memo_service_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1072,7 +977,7 @@ func (x *ListMemoTagsRequest) String() string { func (*ListMemoTagsRequest) ProtoMessage() {} func (x *ListMemoTagsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[15] + mi := &file_api_v1_memo_service_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1085,7 +990,7 @@ func (x *ListMemoTagsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoTagsRequest.ProtoReflect.Descriptor instead. func (*ListMemoTagsRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{15} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{13} } func (x *ListMemoTagsRequest) GetParent() string { @@ -1116,7 +1021,7 @@ type ListMemoTagsResponse struct { func (x *ListMemoTagsResponse) Reset() { *x = ListMemoTagsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[16] + mi := &file_api_v1_memo_service_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1129,7 +1034,7 @@ func (x *ListMemoTagsResponse) String() string { func (*ListMemoTagsResponse) ProtoMessage() {} func (x *ListMemoTagsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[16] + mi := &file_api_v1_memo_service_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1142,7 +1047,7 @@ func (x *ListMemoTagsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoTagsResponse.ProtoReflect.Descriptor instead. func (*ListMemoTagsResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{16} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{14} } func (x *ListMemoTagsResponse) GetTagAmounts() map[string]int32 { @@ -1167,7 +1072,7 @@ type RenameMemoTagRequest struct { func (x *RenameMemoTagRequest) Reset() { *x = RenameMemoTagRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[17] + mi := &file_api_v1_memo_service_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1180,7 +1085,7 @@ func (x *RenameMemoTagRequest) String() string { func (*RenameMemoTagRequest) ProtoMessage() {} func (x *RenameMemoTagRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[17] + mi := &file_api_v1_memo_service_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1193,7 +1098,7 @@ func (x *RenameMemoTagRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RenameMemoTagRequest.ProtoReflect.Descriptor instead. func (*RenameMemoTagRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{17} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{15} } func (x *RenameMemoTagRequest) GetParent() string { @@ -1232,7 +1137,7 @@ type DeleteMemoTagRequest struct { func (x *DeleteMemoTagRequest) Reset() { *x = DeleteMemoTagRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[18] + mi := &file_api_v1_memo_service_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1245,7 +1150,7 @@ func (x *DeleteMemoTagRequest) String() string { func (*DeleteMemoTagRequest) ProtoMessage() {} func (x *DeleteMemoTagRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[18] + mi := &file_api_v1_memo_service_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1258,7 +1163,7 @@ func (x *DeleteMemoTagRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteMemoTagRequest.ProtoReflect.Descriptor instead. func (*DeleteMemoTagRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{18} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{16} } func (x *DeleteMemoTagRequest) GetParent() string { @@ -1296,7 +1201,7 @@ type SetMemoResourcesRequest struct { func (x *SetMemoResourcesRequest) Reset() { *x = SetMemoResourcesRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[19] + mi := &file_api_v1_memo_service_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1309,7 +1214,7 @@ func (x *SetMemoResourcesRequest) String() string { func (*SetMemoResourcesRequest) ProtoMessage() {} func (x *SetMemoResourcesRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[19] + mi := &file_api_v1_memo_service_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1322,7 +1227,7 @@ func (x *SetMemoResourcesRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SetMemoResourcesRequest.ProtoReflect.Descriptor instead. func (*SetMemoResourcesRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{19} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{17} } func (x *SetMemoResourcesRequest) GetName() string { @@ -1352,7 +1257,7 @@ type ListMemoResourcesRequest struct { func (x *ListMemoResourcesRequest) Reset() { *x = ListMemoResourcesRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[20] + mi := &file_api_v1_memo_service_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1365,7 +1270,7 @@ func (x *ListMemoResourcesRequest) String() string { func (*ListMemoResourcesRequest) ProtoMessage() {} func (x *ListMemoResourcesRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[20] + mi := &file_api_v1_memo_service_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1378,7 +1283,7 @@ func (x *ListMemoResourcesRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoResourcesRequest.ProtoReflect.Descriptor instead. func (*ListMemoResourcesRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{20} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{18} } func (x *ListMemoResourcesRequest) GetName() string { @@ -1399,7 +1304,7 @@ type ListMemoResourcesResponse struct { func (x *ListMemoResourcesResponse) Reset() { *x = ListMemoResourcesResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[21] + mi := &file_api_v1_memo_service_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1412,7 +1317,7 @@ func (x *ListMemoResourcesResponse) String() string { func (*ListMemoResourcesResponse) ProtoMessage() {} func (x *ListMemoResourcesResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[21] + mi := &file_api_v1_memo_service_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1425,7 +1330,7 @@ func (x *ListMemoResourcesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoResourcesResponse.ProtoReflect.Descriptor instead. func (*ListMemoResourcesResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{21} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{19} } func (x *ListMemoResourcesResponse) GetResources() []*Resource { @@ -1449,7 +1354,7 @@ type SetMemoRelationsRequest struct { func (x *SetMemoRelationsRequest) Reset() { *x = SetMemoRelationsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[22] + mi := &file_api_v1_memo_service_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1462,7 +1367,7 @@ func (x *SetMemoRelationsRequest) String() string { func (*SetMemoRelationsRequest) ProtoMessage() {} func (x *SetMemoRelationsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[22] + mi := &file_api_v1_memo_service_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1475,7 +1380,7 @@ func (x *SetMemoRelationsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SetMemoRelationsRequest.ProtoReflect.Descriptor instead. func (*SetMemoRelationsRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{22} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{20} } func (x *SetMemoRelationsRequest) GetName() string { @@ -1505,7 +1410,7 @@ type ListMemoRelationsRequest struct { func (x *ListMemoRelationsRequest) Reset() { *x = ListMemoRelationsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[23] + mi := &file_api_v1_memo_service_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1518,7 +1423,7 @@ func (x *ListMemoRelationsRequest) String() string { func (*ListMemoRelationsRequest) ProtoMessage() {} func (x *ListMemoRelationsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[23] + mi := &file_api_v1_memo_service_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1531,7 +1436,7 @@ func (x *ListMemoRelationsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoRelationsRequest.ProtoReflect.Descriptor instead. func (*ListMemoRelationsRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{23} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{21} } func (x *ListMemoRelationsRequest) GetName() string { @@ -1552,7 +1457,7 @@ type ListMemoRelationsResponse struct { func (x *ListMemoRelationsResponse) Reset() { *x = ListMemoRelationsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[24] + mi := &file_api_v1_memo_service_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1565,7 +1470,7 @@ func (x *ListMemoRelationsResponse) String() string { func (*ListMemoRelationsResponse) ProtoMessage() {} func (x *ListMemoRelationsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[24] + mi := &file_api_v1_memo_service_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1578,7 +1483,7 @@ func (x *ListMemoRelationsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoRelationsResponse.ProtoReflect.Descriptor instead. func (*ListMemoRelationsResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{24} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{22} } func (x *ListMemoRelationsResponse) GetRelations() []*MemoRelation { @@ -1602,7 +1507,7 @@ type CreateMemoCommentRequest struct { func (x *CreateMemoCommentRequest) Reset() { *x = CreateMemoCommentRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[25] + mi := &file_api_v1_memo_service_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1615,7 +1520,7 @@ func (x *CreateMemoCommentRequest) String() string { func (*CreateMemoCommentRequest) ProtoMessage() {} func (x *CreateMemoCommentRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[25] + mi := &file_api_v1_memo_service_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1628,7 +1533,7 @@ func (x *CreateMemoCommentRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateMemoCommentRequest.ProtoReflect.Descriptor instead. func (*CreateMemoCommentRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{25} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{23} } func (x *CreateMemoCommentRequest) GetName() string { @@ -1658,7 +1563,7 @@ type ListMemoCommentsRequest struct { func (x *ListMemoCommentsRequest) Reset() { *x = ListMemoCommentsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[26] + mi := &file_api_v1_memo_service_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1671,7 +1576,7 @@ func (x *ListMemoCommentsRequest) String() string { func (*ListMemoCommentsRequest) ProtoMessage() {} func (x *ListMemoCommentsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[26] + mi := &file_api_v1_memo_service_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1684,7 +1589,7 @@ func (x *ListMemoCommentsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoCommentsRequest.ProtoReflect.Descriptor instead. func (*ListMemoCommentsRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{26} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{24} } func (x *ListMemoCommentsRequest) GetName() string { @@ -1705,7 +1610,7 @@ type ListMemoCommentsResponse struct { func (x *ListMemoCommentsResponse) Reset() { *x = ListMemoCommentsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[27] + mi := &file_api_v1_memo_service_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1718,7 +1623,7 @@ func (x *ListMemoCommentsResponse) String() string { func (*ListMemoCommentsResponse) ProtoMessage() {} func (x *ListMemoCommentsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[27] + mi := &file_api_v1_memo_service_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1731,7 +1636,7 @@ func (x *ListMemoCommentsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoCommentsResponse.ProtoReflect.Descriptor instead. func (*ListMemoCommentsResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{27} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{25} } func (x *ListMemoCommentsResponse) GetMemos() []*Memo { @@ -1754,7 +1659,7 @@ type ListMemoReactionsRequest struct { func (x *ListMemoReactionsRequest) Reset() { *x = ListMemoReactionsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[28] + mi := &file_api_v1_memo_service_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1767,7 +1672,7 @@ func (x *ListMemoReactionsRequest) String() string { func (*ListMemoReactionsRequest) ProtoMessage() {} func (x *ListMemoReactionsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[28] + mi := &file_api_v1_memo_service_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1780,7 +1685,7 @@ func (x *ListMemoReactionsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoReactionsRequest.ProtoReflect.Descriptor instead. func (*ListMemoReactionsRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{28} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{26} } func (x *ListMemoReactionsRequest) GetName() string { @@ -1801,7 +1706,7 @@ type ListMemoReactionsResponse struct { func (x *ListMemoReactionsResponse) Reset() { *x = ListMemoReactionsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[29] + mi := &file_api_v1_memo_service_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1814,7 +1719,7 @@ func (x *ListMemoReactionsResponse) String() string { func (*ListMemoReactionsResponse) ProtoMessage() {} func (x *ListMemoReactionsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[29] + mi := &file_api_v1_memo_service_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1827,7 +1732,7 @@ func (x *ListMemoReactionsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMemoReactionsResponse.ProtoReflect.Descriptor instead. func (*ListMemoReactionsResponse) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{29} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{27} } func (x *ListMemoReactionsResponse) GetReactions() []*Reaction { @@ -1851,7 +1756,7 @@ type UpsertMemoReactionRequest struct { func (x *UpsertMemoReactionRequest) Reset() { *x = UpsertMemoReactionRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[30] + mi := &file_api_v1_memo_service_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1864,7 +1769,7 @@ func (x *UpsertMemoReactionRequest) String() string { func (*UpsertMemoReactionRequest) ProtoMessage() {} func (x *UpsertMemoReactionRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[30] + mi := &file_api_v1_memo_service_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1877,7 +1782,7 @@ func (x *UpsertMemoReactionRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpsertMemoReactionRequest.ProtoReflect.Descriptor instead. func (*UpsertMemoReactionRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{30} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{28} } func (x *UpsertMemoReactionRequest) GetName() string { @@ -1905,7 +1810,7 @@ type DeleteMemoReactionRequest struct { func (x *DeleteMemoReactionRequest) Reset() { *x = DeleteMemoReactionRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v1_memo_service_proto_msgTypes[31] + mi := &file_api_v1_memo_service_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1918,7 +1823,7 @@ func (x *DeleteMemoReactionRequest) String() string { func (*DeleteMemoReactionRequest) ProtoMessage() {} func (x *DeleteMemoReactionRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_memo_service_proto_msgTypes[31] + mi := &file_api_v1_memo_service_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1931,7 +1836,7 @@ func (x *DeleteMemoReactionRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteMemoReactionRequest.ProtoReflect.Descriptor instead. func (*DeleteMemoReactionRequest) Descriptor() ([]byte, []int) { - return file_api_v1_memo_service_proto_rawDescGZIP(), []int{31} + return file_api_v1_memo_service_proto_rawDescGZIP(), []int{29} } func (x *DeleteMemoReactionRequest) GetReactionId() int32 { @@ -2067,314 +1972,300 @@ var file_api_v1_memo_service_proto_rawDesc = []byte{ 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0x27, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x2c, 0x0a, 0x12, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, - 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, - 0x22, 0x2f, 0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x22, 0x2f, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x3c, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, - 0x74, 0x69, 0x74, 0x79, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0xab, - 0x01, 0x0a, 0x12, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, - 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x08, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, - 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x50, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x42, 0x04, 0xe2, 0x41, 0x01, 0x03, 0x52, 0x08, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x43, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, - 0x61, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0xe2, 0x41, 0x01, 0x03, 0x52, - 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x30, 0x0a, 0x1a, - 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x45, - 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, - 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, - 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xaa, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, - 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, - 0x0a, 0x0b, 0x74, 0x61, 0x67, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x67, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0x60, 0x0a, 0x14, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x6d, 0x6f, - 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x65, - 0x6e, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x6f, 0x6c, 0x64, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x6c, 0x64, 0x54, 0x61, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x6e, - 0x65, 0x77, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x65, - 0x77, 0x54, 0x61, 0x67, 0x22, 0x72, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, - 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, - 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x6c, 0x61, - 0x74, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x22, 0x63, 0x0a, 0x17, 0x53, 0x65, 0x74, 0x4d, - 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, - 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x2e, 0x0a, - 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x51, 0x0a, - 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, - 0x22, 0x67, 0x0a, 0x17, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x38, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, - 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, - 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x55, 0x0a, 0x19, 0x4c, 0x69, 0x73, - 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, - 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x69, 0x0a, 0x18, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x39, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x2d, 0x0a, 0x17, 0x4c, - 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x44, 0x0a, 0x18, 0x4c, 0x69, - 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, - 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, + 0x6d, 0x65, 0x22, 0x2f, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x3c, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, + 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, + 0xab, 0x01, 0x0a, 0x12, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x08, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, + 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x42, 0x04, 0xe2, 0x41, 0x01, 0x03, 0x52, 0x08, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x43, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, + 0x6c, 0x61, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0xe2, 0x41, 0x01, 0x03, + 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x30, 0x0a, + 0x1a, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x45, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x16, + 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xaa, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x4d, + 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x53, 0x0a, 0x0b, 0x74, 0x61, 0x67, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x67, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x60, 0x0a, 0x14, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x6d, + 0x6f, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, + 0x65, 0x6e, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x6f, 0x6c, 0x64, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x6c, 0x64, 0x54, 0x61, 0x67, 0x12, 0x17, 0x0a, 0x07, + 0x6e, 0x65, 0x77, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, + 0x65, 0x77, 0x54, 0x61, 0x67, 0x22, 0x72, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, + 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x6c, + 0x61, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x22, 0x63, 0x0a, 0x17, 0x53, 0x65, 0x74, + 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x2e, + 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x51, + 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x73, 0x22, 0x67, 0x0a, 0x17, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x51, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, - 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, - 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x63, 0x0a, 0x19, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, - 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, - 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x2a, 0x50, 0x0a, 0x0a, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, - 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, - 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x0d, 0x0a, - 0x09, 0x50, 0x52, 0x4f, 0x54, 0x45, 0x43, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, - 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x10, 0x03, 0x32, 0xb5, 0x15, 0x0a, 0x0b, 0x4d, 0x65, 0x6d, - 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5b, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x18, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, - 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x63, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, - 0x6f, 0x73, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x62, 0x0a, 0x07, 0x47, 0x65, - 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1c, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x12, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, - 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x6f, - 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x42, 0x79, 0x55, 0x69, 0x64, 0x12, 0x21, - 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, - 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x42, 0x79, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, - 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x28, 0xda, 0x41, 0x03, 0x75, 0x69, 0x64, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6d, - 0x6f, 0x73, 0x3a, 0x62, 0x79, 0x2d, 0x75, 0x69, 0x64, 0x2f, 0x7b, 0x75, 0x69, 0x64, 0x7d, 0x12, - 0x7f, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e, - 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, - 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, - 0x6d, 0x6f, 0x22, 0x3c, 0xda, 0x41, 0x10, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x75, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x3a, 0x04, 0x6d, - 0x65, 0x6d, 0x6f, 0x32, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6d, 0x65, - 0x6d, 0x6f, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, - 0x12, 0x6c, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, - 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x2a, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, - 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x73, - 0x0a, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x20, 0x2e, - 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x70, - 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, - 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x65, 0x78, 0x70, - 0x6f, 0x72, 0x74, 0x12, 0x92, 0x01, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x27, 0x2e, 0x6d, 0x65, 0x6d, - 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, - 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x12, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x8d, 0x01, 0x0a, 0x13, 0x52, 0x65, 0x62, - 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x12, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, - 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x22, 0x34, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, - 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x3a, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x7c, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, - 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x12, 0x38, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, + 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x55, 0x0a, 0x19, 0x4c, 0x69, + 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, + 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, + 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x69, 0x0a, 0x18, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x39, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x2d, 0x0a, 0x17, + 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x44, 0x0a, 0x18, 0x4c, + 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, + 0x73, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x51, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, + 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, + 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x63, 0x0a, 0x19, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, + 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x19, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x2a, 0x50, 0x0a, 0x0a, 0x56, 0x69, 0x73, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, + 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, + 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x0d, + 0x0a, 0x09, 0x50, 0x52, 0x4f, 0x54, 0x45, 0x43, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0a, 0x0a, + 0x06, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x10, 0x03, 0x32, 0xc0, 0x14, 0x0a, 0x0b, 0x4d, 0x65, + 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5b, 0x0a, 0x0a, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, + 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x18, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, + 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x63, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, + 0x6d, 0x6f, 0x73, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x62, 0x0a, 0x07, 0x47, + 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1c, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x12, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, + 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, + 0x6f, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x42, 0x79, 0x55, 0x69, 0x64, 0x12, + 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, + 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x42, 0x79, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x28, 0xda, 0x41, 0x03, 0x75, 0x69, 0x64, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, + 0x6d, 0x6f, 0x73, 0x3a, 0x62, 0x79, 0x2d, 0x75, 0x69, 0x64, 0x2f, 0x7b, 0x75, 0x69, 0x64, 0x7d, + 0x12, 0x7f, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, + 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, + 0x65, 0x6d, 0x6f, 0x22, 0x3c, 0xda, 0x41, 0x10, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x3a, 0x04, + 0x6d, 0x65, 0x6d, 0x6f, 0x32, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6d, + 0x65, 0x6d, 0x6f, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, + 0x7d, 0x12, 0x6c, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, + 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x2a, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, + 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, + 0x92, 0x01, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x23, 0x12, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x12, 0x8d, 0x01, 0x0a, 0x13, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, + 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x28, 0x2e, 0x6d, + 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x62, 0x75, + 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x34, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, + 0x7d, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x3a, 0x72, 0x65, 0x62, + 0x75, 0x69, 0x6c, 0x64, 0x12, 0x7c, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, + 0x54, 0x61, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x54, + 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x1f, 0x12, 0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x70, 0x61, + 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x74, 0x61, + 0x67, 0x73, 0x12, 0x7c, 0x0a, 0x0d, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x6d, 0x6f, + 0x54, 0x61, 0x67, 0x12, 0x22, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, + 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x3a, 0x01, 0x2a, 0x32, 0x24, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, + 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x3a, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, + 0x12, 0x78, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, + 0x67, 0x12, 0x22, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2b, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x2a, 0x23, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, + 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x74, 0x61, 0x67, 0x7d, 0x12, 0x85, 0x01, 0x0a, 0x10, 0x53, + 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, + 0x25, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x53, + 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x32, + 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, + 0x32, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, - 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6d, 0x65, - 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, - 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x12, 0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, - 0x2f, 0x7b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, - 0x7d, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x7c, 0x0a, 0x0d, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, - 0x4d, 0x65, 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x12, 0x22, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x6d, - 0x6f, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x3a, 0x01, 0x2a, 0x32, 0x24, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, - 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x3a, 0x72, 0x65, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x78, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, - 0x6d, 0x6f, 0x54, 0x61, 0x67, 0x12, 0x22, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x54, - 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x22, 0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x2a, 0x23, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x76, 0x31, 0x2f, 0x7b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, - 0x2f, 0x2a, 0x7d, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x74, 0x61, 0x67, 0x7d, 0x12, 0x85, - 0x01, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x22, 0x32, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x25, 0x3a, 0x01, 0x2a, 0x32, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, - 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x6d, - 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, - 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, - 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x85, - 0x01, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x22, 0x32, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x25, 0x3a, 0x01, 0x2a, 0x32, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, - 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, - 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, - 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, - 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x88, - 0x01, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, - 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, - 0x22, 0x37, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a, - 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, + 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, + 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, + 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x85, 0x01, 0x0a, 0x10, 0x53, + 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, + 0x25, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x53, + 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x32, + 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, + 0x32, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, + 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, + 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, - 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x91, 0x01, 0x0a, 0x10, 0x4c, 0x69, - 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, - 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0xda, - 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x12, 0x1f, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, - 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x95, 0x01, - 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, - 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, - 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x89, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, - 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x2e, 0x6d, - 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x73, 0x65, - 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x32, 0xda, - 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22, + 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x88, 0x01, 0x0a, 0x11, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, + 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x22, 0x37, 0xda, 0x41, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a, 0x07, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x91, 0x01, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, + 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, 0x2e, 0x6d, 0x65, 0x6d, + 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, + 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0xda, 0x41, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x12, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, + 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, + 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, + 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, + 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, + 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x12, 0x8c, 0x01, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, + 0x73, 0x12, 0x89, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, - 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x35, 0xda, 0x41, 0x0b, 0x72, 0x65, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x2a, - 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x7b, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x7d, - 0x42, 0xa8, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x10, 0x4d, 0x65, 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, - 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d, 0x41, - 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x31, - 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0xe2, - 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, - 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, - 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x74, 0x1a, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, + 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x32, 0xda, 0x41, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22, 0x20, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8c, 0x01, + 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x35, 0xda, 0x41, 0x0b, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x2a, 0x1f, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x7b, + 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x7d, 0x42, 0xa8, 0x01, 0x0a, + 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x31, 0x42, 0x10, 0x4d, 0x65, 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, + 0x31, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, + 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x4d, + 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x4d, 0x65, + 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, + 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2390,7 +2281,7 @@ func file_api_v1_memo_service_proto_rawDescGZIP() []byte { } var file_api_v1_memo_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_api_v1_memo_service_proto_msgTypes = make([]protoimpl.MessageInfo, 33) +var file_api_v1_memo_service_proto_msgTypes = make([]protoimpl.MessageInfo, 31) var file_api_v1_memo_service_proto_goTypes = []any{ (Visibility)(0), // 0: memos.api.v1.Visibility (*Memo)(nil), // 1: memos.api.v1.Memo @@ -2402,110 +2293,106 @@ var file_api_v1_memo_service_proto_goTypes = []any{ (*GetMemoByUidRequest)(nil), // 7: memos.api.v1.GetMemoByUidRequest (*UpdateMemoRequest)(nil), // 8: memos.api.v1.UpdateMemoRequest (*DeleteMemoRequest)(nil), // 9: memos.api.v1.DeleteMemoRequest - (*ExportMemosRequest)(nil), // 10: memos.api.v1.ExportMemosRequest - (*ExportMemosResponse)(nil), // 11: memos.api.v1.ExportMemosResponse - (*ListMemoPropertiesRequest)(nil), // 12: memos.api.v1.ListMemoPropertiesRequest - (*ListMemoPropertiesResponse)(nil), // 13: memos.api.v1.ListMemoPropertiesResponse - (*MemoPropertyEntity)(nil), // 14: memos.api.v1.MemoPropertyEntity - (*RebuildMemoPropertyRequest)(nil), // 15: memos.api.v1.RebuildMemoPropertyRequest - (*ListMemoTagsRequest)(nil), // 16: memos.api.v1.ListMemoTagsRequest - (*ListMemoTagsResponse)(nil), // 17: memos.api.v1.ListMemoTagsResponse - (*RenameMemoTagRequest)(nil), // 18: memos.api.v1.RenameMemoTagRequest - (*DeleteMemoTagRequest)(nil), // 19: memos.api.v1.DeleteMemoTagRequest - (*SetMemoResourcesRequest)(nil), // 20: memos.api.v1.SetMemoResourcesRequest - (*ListMemoResourcesRequest)(nil), // 21: memos.api.v1.ListMemoResourcesRequest - (*ListMemoResourcesResponse)(nil), // 22: memos.api.v1.ListMemoResourcesResponse - (*SetMemoRelationsRequest)(nil), // 23: memos.api.v1.SetMemoRelationsRequest - (*ListMemoRelationsRequest)(nil), // 24: memos.api.v1.ListMemoRelationsRequest - (*ListMemoRelationsResponse)(nil), // 25: memos.api.v1.ListMemoRelationsResponse - (*CreateMemoCommentRequest)(nil), // 26: memos.api.v1.CreateMemoCommentRequest - (*ListMemoCommentsRequest)(nil), // 27: memos.api.v1.ListMemoCommentsRequest - (*ListMemoCommentsResponse)(nil), // 28: memos.api.v1.ListMemoCommentsResponse - (*ListMemoReactionsRequest)(nil), // 29: memos.api.v1.ListMemoReactionsRequest - (*ListMemoReactionsResponse)(nil), // 30: memos.api.v1.ListMemoReactionsResponse - (*UpsertMemoReactionRequest)(nil), // 31: memos.api.v1.UpsertMemoReactionRequest - (*DeleteMemoReactionRequest)(nil), // 32: memos.api.v1.DeleteMemoReactionRequest - nil, // 33: memos.api.v1.ListMemoTagsResponse.TagAmountsEntry - (RowStatus)(0), // 34: memos.api.v1.RowStatus - (*timestamppb.Timestamp)(nil), // 35: google.protobuf.Timestamp - (*Node)(nil), // 36: memos.api.v1.Node - (*Resource)(nil), // 37: memos.api.v1.Resource - (*MemoRelation)(nil), // 38: memos.api.v1.MemoRelation - (*Reaction)(nil), // 39: memos.api.v1.Reaction - (*fieldmaskpb.FieldMask)(nil), // 40: google.protobuf.FieldMask - (*emptypb.Empty)(nil), // 41: google.protobuf.Empty + (*ListMemoPropertiesRequest)(nil), // 10: memos.api.v1.ListMemoPropertiesRequest + (*ListMemoPropertiesResponse)(nil), // 11: memos.api.v1.ListMemoPropertiesResponse + (*MemoPropertyEntity)(nil), // 12: memos.api.v1.MemoPropertyEntity + (*RebuildMemoPropertyRequest)(nil), // 13: memos.api.v1.RebuildMemoPropertyRequest + (*ListMemoTagsRequest)(nil), // 14: memos.api.v1.ListMemoTagsRequest + (*ListMemoTagsResponse)(nil), // 15: memos.api.v1.ListMemoTagsResponse + (*RenameMemoTagRequest)(nil), // 16: memos.api.v1.RenameMemoTagRequest + (*DeleteMemoTagRequest)(nil), // 17: memos.api.v1.DeleteMemoTagRequest + (*SetMemoResourcesRequest)(nil), // 18: memos.api.v1.SetMemoResourcesRequest + (*ListMemoResourcesRequest)(nil), // 19: memos.api.v1.ListMemoResourcesRequest + (*ListMemoResourcesResponse)(nil), // 20: memos.api.v1.ListMemoResourcesResponse + (*SetMemoRelationsRequest)(nil), // 21: memos.api.v1.SetMemoRelationsRequest + (*ListMemoRelationsRequest)(nil), // 22: memos.api.v1.ListMemoRelationsRequest + (*ListMemoRelationsResponse)(nil), // 23: memos.api.v1.ListMemoRelationsResponse + (*CreateMemoCommentRequest)(nil), // 24: memos.api.v1.CreateMemoCommentRequest + (*ListMemoCommentsRequest)(nil), // 25: memos.api.v1.ListMemoCommentsRequest + (*ListMemoCommentsResponse)(nil), // 26: memos.api.v1.ListMemoCommentsResponse + (*ListMemoReactionsRequest)(nil), // 27: memos.api.v1.ListMemoReactionsRequest + (*ListMemoReactionsResponse)(nil), // 28: memos.api.v1.ListMemoReactionsResponse + (*UpsertMemoReactionRequest)(nil), // 29: memos.api.v1.UpsertMemoReactionRequest + (*DeleteMemoReactionRequest)(nil), // 30: memos.api.v1.DeleteMemoReactionRequest + nil, // 31: memos.api.v1.ListMemoTagsResponse.TagAmountsEntry + (RowStatus)(0), // 32: memos.api.v1.RowStatus + (*timestamppb.Timestamp)(nil), // 33: google.protobuf.Timestamp + (*Node)(nil), // 34: memos.api.v1.Node + (*Resource)(nil), // 35: memos.api.v1.Resource + (*MemoRelation)(nil), // 36: memos.api.v1.MemoRelation + (*Reaction)(nil), // 37: memos.api.v1.Reaction + (*fieldmaskpb.FieldMask)(nil), // 38: google.protobuf.FieldMask + (*emptypb.Empty)(nil), // 39: google.protobuf.Empty } var file_api_v1_memo_service_proto_depIdxs = []int32{ - 34, // 0: memos.api.v1.Memo.row_status:type_name -> memos.api.v1.RowStatus - 35, // 1: memos.api.v1.Memo.create_time:type_name -> google.protobuf.Timestamp - 35, // 2: memos.api.v1.Memo.update_time:type_name -> google.protobuf.Timestamp - 35, // 3: memos.api.v1.Memo.display_time:type_name -> google.protobuf.Timestamp - 36, // 4: memos.api.v1.Memo.nodes:type_name -> memos.api.v1.Node + 32, // 0: memos.api.v1.Memo.row_status:type_name -> memos.api.v1.RowStatus + 33, // 1: memos.api.v1.Memo.create_time:type_name -> google.protobuf.Timestamp + 33, // 2: memos.api.v1.Memo.update_time:type_name -> google.protobuf.Timestamp + 33, // 3: memos.api.v1.Memo.display_time:type_name -> google.protobuf.Timestamp + 34, // 4: memos.api.v1.Memo.nodes:type_name -> memos.api.v1.Node 0, // 5: memos.api.v1.Memo.visibility:type_name -> memos.api.v1.Visibility - 37, // 6: memos.api.v1.Memo.resources:type_name -> memos.api.v1.Resource - 38, // 7: memos.api.v1.Memo.relations:type_name -> memos.api.v1.MemoRelation - 39, // 8: memos.api.v1.Memo.reactions:type_name -> memos.api.v1.Reaction + 35, // 6: memos.api.v1.Memo.resources:type_name -> memos.api.v1.Resource + 36, // 7: memos.api.v1.Memo.relations:type_name -> memos.api.v1.MemoRelation + 37, // 8: memos.api.v1.Memo.reactions:type_name -> memos.api.v1.Reaction 2, // 9: memos.api.v1.Memo.property:type_name -> memos.api.v1.MemoProperty 0, // 10: memos.api.v1.CreateMemoRequest.visibility:type_name -> memos.api.v1.Visibility 1, // 11: memos.api.v1.ListMemosResponse.memos:type_name -> memos.api.v1.Memo 1, // 12: memos.api.v1.UpdateMemoRequest.memo:type_name -> memos.api.v1.Memo - 40, // 13: memos.api.v1.UpdateMemoRequest.update_mask:type_name -> google.protobuf.FieldMask - 14, // 14: memos.api.v1.ListMemoPropertiesResponse.entities:type_name -> memos.api.v1.MemoPropertyEntity + 38, // 13: memos.api.v1.UpdateMemoRequest.update_mask:type_name -> google.protobuf.FieldMask + 12, // 14: memos.api.v1.ListMemoPropertiesResponse.entities:type_name -> memos.api.v1.MemoPropertyEntity 2, // 15: memos.api.v1.MemoPropertyEntity.property:type_name -> memos.api.v1.MemoProperty - 35, // 16: memos.api.v1.MemoPropertyEntity.display_time:type_name -> google.protobuf.Timestamp - 33, // 17: memos.api.v1.ListMemoTagsResponse.tag_amounts:type_name -> memos.api.v1.ListMemoTagsResponse.TagAmountsEntry - 37, // 18: memos.api.v1.SetMemoResourcesRequest.resources:type_name -> memos.api.v1.Resource - 37, // 19: memos.api.v1.ListMemoResourcesResponse.resources:type_name -> memos.api.v1.Resource - 38, // 20: memos.api.v1.SetMemoRelationsRequest.relations:type_name -> memos.api.v1.MemoRelation - 38, // 21: memos.api.v1.ListMemoRelationsResponse.relations:type_name -> memos.api.v1.MemoRelation + 33, // 16: memos.api.v1.MemoPropertyEntity.display_time:type_name -> google.protobuf.Timestamp + 31, // 17: memos.api.v1.ListMemoTagsResponse.tag_amounts:type_name -> memos.api.v1.ListMemoTagsResponse.TagAmountsEntry + 35, // 18: memos.api.v1.SetMemoResourcesRequest.resources:type_name -> memos.api.v1.Resource + 35, // 19: memos.api.v1.ListMemoResourcesResponse.resources:type_name -> memos.api.v1.Resource + 36, // 20: memos.api.v1.SetMemoRelationsRequest.relations:type_name -> memos.api.v1.MemoRelation + 36, // 21: memos.api.v1.ListMemoRelationsResponse.relations:type_name -> memos.api.v1.MemoRelation 3, // 22: memos.api.v1.CreateMemoCommentRequest.comment:type_name -> memos.api.v1.CreateMemoRequest 1, // 23: memos.api.v1.ListMemoCommentsResponse.memos:type_name -> memos.api.v1.Memo - 39, // 24: memos.api.v1.ListMemoReactionsResponse.reactions:type_name -> memos.api.v1.Reaction - 39, // 25: memos.api.v1.UpsertMemoReactionRequest.reaction:type_name -> memos.api.v1.Reaction + 37, // 24: memos.api.v1.ListMemoReactionsResponse.reactions:type_name -> memos.api.v1.Reaction + 37, // 25: memos.api.v1.UpsertMemoReactionRequest.reaction:type_name -> memos.api.v1.Reaction 3, // 26: memos.api.v1.MemoService.CreateMemo:input_type -> memos.api.v1.CreateMemoRequest 4, // 27: memos.api.v1.MemoService.ListMemos:input_type -> memos.api.v1.ListMemosRequest 6, // 28: memos.api.v1.MemoService.GetMemo:input_type -> memos.api.v1.GetMemoRequest 7, // 29: memos.api.v1.MemoService.GetMemoByUid:input_type -> memos.api.v1.GetMemoByUidRequest 8, // 30: memos.api.v1.MemoService.UpdateMemo:input_type -> memos.api.v1.UpdateMemoRequest 9, // 31: memos.api.v1.MemoService.DeleteMemo:input_type -> memos.api.v1.DeleteMemoRequest - 10, // 32: memos.api.v1.MemoService.ExportMemos:input_type -> memos.api.v1.ExportMemosRequest - 12, // 33: memos.api.v1.MemoService.ListMemoProperties:input_type -> memos.api.v1.ListMemoPropertiesRequest - 15, // 34: memos.api.v1.MemoService.RebuildMemoProperty:input_type -> memos.api.v1.RebuildMemoPropertyRequest - 16, // 35: memos.api.v1.MemoService.ListMemoTags:input_type -> memos.api.v1.ListMemoTagsRequest - 18, // 36: memos.api.v1.MemoService.RenameMemoTag:input_type -> memos.api.v1.RenameMemoTagRequest - 19, // 37: memos.api.v1.MemoService.DeleteMemoTag:input_type -> memos.api.v1.DeleteMemoTagRequest - 20, // 38: memos.api.v1.MemoService.SetMemoResources:input_type -> memos.api.v1.SetMemoResourcesRequest - 21, // 39: memos.api.v1.MemoService.ListMemoResources:input_type -> memos.api.v1.ListMemoResourcesRequest - 23, // 40: memos.api.v1.MemoService.SetMemoRelations:input_type -> memos.api.v1.SetMemoRelationsRequest - 24, // 41: memos.api.v1.MemoService.ListMemoRelations:input_type -> memos.api.v1.ListMemoRelationsRequest - 26, // 42: memos.api.v1.MemoService.CreateMemoComment:input_type -> memos.api.v1.CreateMemoCommentRequest - 27, // 43: memos.api.v1.MemoService.ListMemoComments:input_type -> memos.api.v1.ListMemoCommentsRequest - 29, // 44: memos.api.v1.MemoService.ListMemoReactions:input_type -> memos.api.v1.ListMemoReactionsRequest - 31, // 45: memos.api.v1.MemoService.UpsertMemoReaction:input_type -> memos.api.v1.UpsertMemoReactionRequest - 32, // 46: memos.api.v1.MemoService.DeleteMemoReaction:input_type -> memos.api.v1.DeleteMemoReactionRequest - 1, // 47: memos.api.v1.MemoService.CreateMemo:output_type -> memos.api.v1.Memo - 5, // 48: memos.api.v1.MemoService.ListMemos:output_type -> memos.api.v1.ListMemosResponse - 1, // 49: memos.api.v1.MemoService.GetMemo:output_type -> memos.api.v1.Memo - 1, // 50: memos.api.v1.MemoService.GetMemoByUid:output_type -> memos.api.v1.Memo - 1, // 51: memos.api.v1.MemoService.UpdateMemo:output_type -> memos.api.v1.Memo - 41, // 52: memos.api.v1.MemoService.DeleteMemo:output_type -> google.protobuf.Empty - 11, // 53: memos.api.v1.MemoService.ExportMemos:output_type -> memos.api.v1.ExportMemosResponse - 13, // 54: memos.api.v1.MemoService.ListMemoProperties:output_type -> memos.api.v1.ListMemoPropertiesResponse - 41, // 55: memos.api.v1.MemoService.RebuildMemoProperty:output_type -> google.protobuf.Empty - 17, // 56: memos.api.v1.MemoService.ListMemoTags:output_type -> memos.api.v1.ListMemoTagsResponse - 41, // 57: memos.api.v1.MemoService.RenameMemoTag:output_type -> google.protobuf.Empty - 41, // 58: memos.api.v1.MemoService.DeleteMemoTag:output_type -> google.protobuf.Empty - 41, // 59: memos.api.v1.MemoService.SetMemoResources:output_type -> google.protobuf.Empty - 22, // 60: memos.api.v1.MemoService.ListMemoResources:output_type -> memos.api.v1.ListMemoResourcesResponse - 41, // 61: memos.api.v1.MemoService.SetMemoRelations:output_type -> google.protobuf.Empty - 25, // 62: memos.api.v1.MemoService.ListMemoRelations:output_type -> memos.api.v1.ListMemoRelationsResponse - 1, // 63: memos.api.v1.MemoService.CreateMemoComment:output_type -> memos.api.v1.Memo - 28, // 64: memos.api.v1.MemoService.ListMemoComments:output_type -> memos.api.v1.ListMemoCommentsResponse - 30, // 65: memos.api.v1.MemoService.ListMemoReactions:output_type -> memos.api.v1.ListMemoReactionsResponse - 39, // 66: memos.api.v1.MemoService.UpsertMemoReaction:output_type -> memos.api.v1.Reaction - 41, // 67: memos.api.v1.MemoService.DeleteMemoReaction:output_type -> google.protobuf.Empty - 47, // [47:68] is the sub-list for method output_type - 26, // [26:47] is the sub-list for method input_type + 10, // 32: memos.api.v1.MemoService.ListMemoProperties:input_type -> memos.api.v1.ListMemoPropertiesRequest + 13, // 33: memos.api.v1.MemoService.RebuildMemoProperty:input_type -> memos.api.v1.RebuildMemoPropertyRequest + 14, // 34: memos.api.v1.MemoService.ListMemoTags:input_type -> memos.api.v1.ListMemoTagsRequest + 16, // 35: memos.api.v1.MemoService.RenameMemoTag:input_type -> memos.api.v1.RenameMemoTagRequest + 17, // 36: memos.api.v1.MemoService.DeleteMemoTag:input_type -> memos.api.v1.DeleteMemoTagRequest + 18, // 37: memos.api.v1.MemoService.SetMemoResources:input_type -> memos.api.v1.SetMemoResourcesRequest + 19, // 38: memos.api.v1.MemoService.ListMemoResources:input_type -> memos.api.v1.ListMemoResourcesRequest + 21, // 39: memos.api.v1.MemoService.SetMemoRelations:input_type -> memos.api.v1.SetMemoRelationsRequest + 22, // 40: memos.api.v1.MemoService.ListMemoRelations:input_type -> memos.api.v1.ListMemoRelationsRequest + 24, // 41: memos.api.v1.MemoService.CreateMemoComment:input_type -> memos.api.v1.CreateMemoCommentRequest + 25, // 42: memos.api.v1.MemoService.ListMemoComments:input_type -> memos.api.v1.ListMemoCommentsRequest + 27, // 43: memos.api.v1.MemoService.ListMemoReactions:input_type -> memos.api.v1.ListMemoReactionsRequest + 29, // 44: memos.api.v1.MemoService.UpsertMemoReaction:input_type -> memos.api.v1.UpsertMemoReactionRequest + 30, // 45: memos.api.v1.MemoService.DeleteMemoReaction:input_type -> memos.api.v1.DeleteMemoReactionRequest + 1, // 46: memos.api.v1.MemoService.CreateMemo:output_type -> memos.api.v1.Memo + 5, // 47: memos.api.v1.MemoService.ListMemos:output_type -> memos.api.v1.ListMemosResponse + 1, // 48: memos.api.v1.MemoService.GetMemo:output_type -> memos.api.v1.Memo + 1, // 49: memos.api.v1.MemoService.GetMemoByUid:output_type -> memos.api.v1.Memo + 1, // 50: memos.api.v1.MemoService.UpdateMemo:output_type -> memos.api.v1.Memo + 39, // 51: memos.api.v1.MemoService.DeleteMemo:output_type -> google.protobuf.Empty + 11, // 52: memos.api.v1.MemoService.ListMemoProperties:output_type -> memos.api.v1.ListMemoPropertiesResponse + 39, // 53: memos.api.v1.MemoService.RebuildMemoProperty:output_type -> google.protobuf.Empty + 15, // 54: memos.api.v1.MemoService.ListMemoTags:output_type -> memos.api.v1.ListMemoTagsResponse + 39, // 55: memos.api.v1.MemoService.RenameMemoTag:output_type -> google.protobuf.Empty + 39, // 56: memos.api.v1.MemoService.DeleteMemoTag:output_type -> google.protobuf.Empty + 39, // 57: memos.api.v1.MemoService.SetMemoResources:output_type -> google.protobuf.Empty + 20, // 58: memos.api.v1.MemoService.ListMemoResources:output_type -> memos.api.v1.ListMemoResourcesResponse + 39, // 59: memos.api.v1.MemoService.SetMemoRelations:output_type -> google.protobuf.Empty + 23, // 60: memos.api.v1.MemoService.ListMemoRelations:output_type -> memos.api.v1.ListMemoRelationsResponse + 1, // 61: memos.api.v1.MemoService.CreateMemoComment:output_type -> memos.api.v1.Memo + 26, // 62: memos.api.v1.MemoService.ListMemoComments:output_type -> memos.api.v1.ListMemoCommentsResponse + 28, // 63: memos.api.v1.MemoService.ListMemoReactions:output_type -> memos.api.v1.ListMemoReactionsResponse + 37, // 64: memos.api.v1.MemoService.UpsertMemoReaction:output_type -> memos.api.v1.Reaction + 39, // 65: memos.api.v1.MemoService.DeleteMemoReaction:output_type -> google.protobuf.Empty + 46, // [46:66] is the sub-list for method output_type + 26, // [26:46] is the sub-list for method input_type 26, // [26:26] is the sub-list for extension type_name 26, // [26:26] is the sub-list for extension extendee 0, // [0:26] is the sub-list for field type_name @@ -2631,30 +2518,6 @@ func file_api_v1_memo_service_proto_init() { } } file_api_v1_memo_service_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ExportMemosRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_memo_service_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*ExportMemosResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_memo_service_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*ListMemoPropertiesRequest); i { case 0: return &v.state @@ -2666,7 +2529,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[12].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*ListMemoPropertiesResponse); i { case 0: return &v.state @@ -2678,7 +2541,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[13].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*MemoPropertyEntity); i { case 0: return &v.state @@ -2690,7 +2553,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[14].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*RebuildMemoPropertyRequest); i { case 0: return &v.state @@ -2702,7 +2565,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[15].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*ListMemoTagsRequest); i { case 0: return &v.state @@ -2714,7 +2577,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[16].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*ListMemoTagsResponse); i { case 0: return &v.state @@ -2726,7 +2589,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[17].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*RenameMemoTagRequest); i { case 0: return &v.state @@ -2738,7 +2601,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[18].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*DeleteMemoTagRequest); i { case 0: return &v.state @@ -2750,7 +2613,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[19].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*SetMemoResourcesRequest); i { case 0: return &v.state @@ -2762,7 +2625,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[20].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*ListMemoResourcesRequest); i { case 0: return &v.state @@ -2774,7 +2637,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[21].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*ListMemoResourcesResponse); i { case 0: return &v.state @@ -2786,7 +2649,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[22].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*SetMemoRelationsRequest); i { case 0: return &v.state @@ -2798,7 +2661,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[23].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*ListMemoRelationsRequest); i { case 0: return &v.state @@ -2810,7 +2673,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[24].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*ListMemoRelationsResponse); i { case 0: return &v.state @@ -2822,7 +2685,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[25].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*CreateMemoCommentRequest); i { case 0: return &v.state @@ -2834,7 +2697,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[26].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*ListMemoCommentsRequest); i { case 0: return &v.state @@ -2846,7 +2709,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[27].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[25].Exporter = func(v any, i int) any { switch v := v.(*ListMemoCommentsResponse); i { case 0: return &v.state @@ -2858,7 +2721,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[28].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[26].Exporter = func(v any, i int) any { switch v := v.(*ListMemoReactionsRequest); i { case 0: return &v.state @@ -2870,7 +2733,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[29].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[27].Exporter = func(v any, i int) any { switch v := v.(*ListMemoReactionsResponse); i { case 0: return &v.state @@ -2882,7 +2745,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[30].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[28].Exporter = func(v any, i int) any { switch v := v.(*UpsertMemoReactionRequest); i { case 0: return &v.state @@ -2894,7 +2757,7 @@ func file_api_v1_memo_service_proto_init() { return nil } } - file_api_v1_memo_service_proto_msgTypes[31].Exporter = func(v any, i int) any { + file_api_v1_memo_service_proto_msgTypes[29].Exporter = func(v any, i int) any { switch v := v.(*DeleteMemoReactionRequest); i { case 0: return &v.state @@ -2914,7 +2777,7 @@ func file_api_v1_memo_service_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_api_v1_memo_service_proto_rawDesc, NumEnums: 1, - NumMessages: 33, + NumMessages: 31, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/gen/api/v1/memo_service.pb.gw.go b/proto/gen/api/v1/memo_service.pb.gw.go index 507e8c54a556b..81496b6aedf8e 100644 --- a/proto/gen/api/v1/memo_service.pb.gw.go +++ b/proto/gen/api/v1/memo_service.pb.gw.go @@ -349,32 +349,6 @@ func local_request_MemoService_DeleteMemo_0(ctx context.Context, marshaler runti } -func request_MemoService_ExportMemos_0(ctx context.Context, marshaler runtime.Marshaler, client MemoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ExportMemosRequest - var metadata runtime.ServerMetadata - - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) - } - - msg, err := client.ExportMemos(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_MemoService_ExportMemos_0(ctx context.Context, marshaler runtime.Marshaler, server MemoServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ExportMemosRequest - var metadata runtime.ServerMetadata - - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) - } - - msg, err := server.ExportMemos(ctx, &protoReq) - return msg, metadata, err - -} - func request_MemoService_ListMemoProperties_0(ctx context.Context, marshaler runtime.Marshaler, client MemoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ListMemoPropertiesRequest var metadata runtime.ServerMetadata @@ -1364,31 +1338,6 @@ func RegisterMemoServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux }) - mux.Handle(""POST"", pattern_MemoService_ExportMemos_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, ""/memos.api.v1.MemoService/ExportMemos"", runtime.WithHTTPPathPattern(""/api/v1/memos:export"")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_MemoService_ExportMemos_0(annotatedContext, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - - forward_MemoService_ExportMemos_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle(""GET"", pattern_MemoService_ListMemoProperties_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1912,28 +1861,6 @@ func RegisterMemoServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux }) - mux.Handle(""POST"", pattern_MemoService_ExportMemos_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, ""/memos.api.v1.MemoService/ExportMemos"", runtime.WithHTTPPathPattern(""/api/v1/memos:export"")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_MemoService_ExportMemos_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - - forward_MemoService_ExportMemos_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle(""GET"", pattern_MemoService_ListMemoProperties_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2258,8 +2185,6 @@ var ( pattern_MemoService_DeleteMemo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{""api"", ""v1"", ""memos"", ""name""}, """")) - pattern_MemoService_ExportMemos_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{""api"", ""v1"", ""memos""}, ""export"")) - pattern_MemoService_ListMemoProperties_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{""api"", ""v1"", ""memos"", ""name"", ""properties""}, """")) pattern_MemoService_RebuildMemoProperty_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{""api"", ""v1"", ""memos"", ""name"", ""properties""}, ""rebuild"")) @@ -2302,8 +2227,6 @@ var ( forward_MemoService_DeleteMemo_0 = runtime.ForwardResponseMessage - forward_MemoService_ExportMemos_0 = runtime.ForwardResponseMessage - forward_MemoService_ListMemoProperties_0 = runtime.ForwardResponseMessage forward_MemoService_RebuildMemoProperty_0 = runtime.ForwardResponseMessage diff --git a/proto/gen/api/v1/memo_service_grpc.pb.go b/proto/gen/api/v1/memo_service_grpc.pb.go index 1298c5d858d94..e57bf0adbb376 100644 --- a/proto/gen/api/v1/memo_service_grpc.pb.go +++ b/proto/gen/api/v1/memo_service_grpc.pb.go @@ -26,7 +26,6 @@ const ( MemoService_GetMemoByUid_FullMethodName = ""/memos.api.v1.MemoService/GetMemoByUid"" MemoService_UpdateMemo_FullMethodName = ""/memos.api.v1.MemoService/UpdateMemo"" MemoService_DeleteMemo_FullMethodName = ""/memos.api.v1.MemoService/DeleteMemo"" - MemoService_ExportMemos_FullMethodName = ""/memos.api.v1.MemoService/ExportMemos"" MemoService_ListMemoProperties_FullMethodName = ""/memos.api.v1.MemoService/ListMemoProperties"" MemoService_RebuildMemoProperty_FullMethodName = ""/memos.api.v1.MemoService/RebuildMemoProperty"" MemoService_ListMemoTags_FullMethodName = ""/memos.api.v1.MemoService/ListMemoTags"" @@ -59,8 +58,6 @@ type MemoServiceClient interface { UpdateMemo(ctx context.Context, in *UpdateMemoRequest, opts ...grpc.CallOption) (*Memo, error) // DeleteMemo deletes a memo. DeleteMemo(ctx context.Context, in *DeleteMemoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) - // ExportMemos exports memos. - ExportMemos(ctx context.Context, in *ExportMemosRequest, opts ...grpc.CallOption) (*ExportMemosResponse, error) // ListMemoProperties lists memo properties. ListMemoProperties(ctx context.Context, in *ListMemoPropertiesRequest, opts ...grpc.CallOption) (*ListMemoPropertiesResponse, error) // RebuildMemoProperty rebuilds a memo property. @@ -159,16 +156,6 @@ func (c *memoServiceClient) DeleteMemo(ctx context.Context, in *DeleteMemoReques return out, nil } -func (c *memoServiceClient) ExportMemos(ctx context.Context, in *ExportMemosRequest, opts ...grpc.CallOption) (*ExportMemosResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(ExportMemosResponse) - err := c.cc.Invoke(ctx, MemoService_ExportMemos_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *memoServiceClient) ListMemoProperties(ctx context.Context, in *ListMemoPropertiesRequest, opts ...grpc.CallOption) (*ListMemoPropertiesResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListMemoPropertiesResponse) @@ -325,8 +312,6 @@ type MemoServiceServer interface { UpdateMemo(context.Context, *UpdateMemoRequest) (*Memo, error) // DeleteMemo deletes a memo. DeleteMemo(context.Context, *DeleteMemoRequest) (*emptypb.Empty, error) - // ExportMemos exports memos. - ExportMemos(context.Context, *ExportMemosRequest) (*ExportMemosResponse, error) // ListMemoProperties lists memo properties. ListMemoProperties(context.Context, *ListMemoPropertiesRequest) (*ListMemoPropertiesResponse, error) // RebuildMemoProperty rebuilds a memo property. @@ -383,9 +368,6 @@ func (UnimplementedMemoServiceServer) UpdateMemo(context.Context, *UpdateMemoReq func (UnimplementedMemoServiceServer) DeleteMemo(context.Context, *DeleteMemoRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, ""method DeleteMemo not implemented"") } -func (UnimplementedMemoServiceServer) ExportMemos(context.Context, *ExportMemosRequest) (*ExportMemosResponse, error) { - return nil, status.Errorf(codes.Unimplemented, ""method ExportMemos not implemented"") -} func (UnimplementedMemoServiceServer) ListMemoProperties(context.Context, *ListMemoPropertiesRequest) (*ListMemoPropertiesResponse, error) { return nil, status.Errorf(codes.Unimplemented, ""method ListMemoProperties not implemented"") } @@ -557,24 +539,6 @@ func _MemoService_DeleteMemo_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } -func _MemoService_ExportMemos_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ExportMemosRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MemoServiceServer).ExportMemos(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: MemoService_ExportMemos_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MemoServiceServer).ExportMemos(ctx, req.(*ExportMemosRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _MemoService_ListMemoProperties_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListMemoPropertiesRequest) if err := dec(in); err != nil { @@ -858,10 +822,6 @@ var MemoService_ServiceDesc = grpc.ServiceDesc{ MethodName: ""DeleteMemo"", Handler: _MemoService_DeleteMemo_Handler, }, - { - MethodName: ""ExportMemos"", - Handler: _MemoService_ExportMemos_Handler, - }, { MethodName: ""ListMemoProperties"", Handler: _MemoService_ListMemoProperties_Handler, diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.go index b38e91981e17e..58f36c234b167 100644 --- a/server/router/api/v1/memo_service.go +++ b/server/router/api/v1/memo_service.go @@ -1,8 +1,6 @@ package v1 import ( - ""archive/zip"" - ""bytes"" ""context"" ""fmt"" ""log/slog"" @@ -491,47 +489,6 @@ func (s *APIV1Service) ListMemoComments(ctx context.Context, request *v1pb.ListM return response, nil } -func (s *APIV1Service) ExportMemos(ctx context.Context, request *v1pb.ExportMemosRequest) (*v1pb.ExportMemosResponse, error) { - normalRowStatus := store.Normal - memoFind := &store.FindMemo{ - RowStatus: &normalRowStatus, - // Exclude comments by default. - ExcludeComments: true, - } - if err := s.buildMemoFindWithFilter(ctx, memoFind, request.Filter); err != nil { - return nil, status.Errorf(codes.InvalidArgument, ""failed to build find memos with filter: %v"", err) - } - - memos, err := s.Store.ListMemos(ctx, memoFind) - if err != nil { - return nil, status.Errorf(codes.Internal, ""failed to list memos: %v"", err) - } - - buf := new(bytes.Buffer) - writer := zip.NewWriter(buf) - for _, memo := range memos { - memoMessage, err := s.convertMemoFromStore(ctx, memo) - if err != nil { - return nil, errors.Wrap(err, ""failed to convert memo"") - } - file, err := writer.Create(time.Unix(memo.CreatedTs, 0).Format(time.RFC3339) + ""-"" + memo.UID + ""-"" + string(memo.Visibility) + "".md"") - if err != nil { - return nil, status.Errorf(codes.Internal, ""Failed to create memo file"") - } - _, err = file.Write([]byte(memoMessage.Content)) - if err != nil { - return nil, status.Errorf(codes.Internal, ""Failed to write to memo file"") - } - } - if err := writer.Close(); err != nil { - return nil, status.Errorf(codes.Internal, ""Failed to close zip file writer"") - } - - return &v1pb.ExportMemosResponse{ - Content: buf.Bytes(), - }, nil -} - func (s *APIV1Service) ListMemoProperties(ctx context.Context, request *v1pb.ListMemoPropertiesRequest) (*v1pb.ListMemoPropertiesResponse, error) { user, err := s.GetCurrentUser(ctx) if err != nil { diff --git a/web/src/components/Settings/MyAccountSection.tsx b/web/src/components/Settings/MyAccountSection.tsx index 9257f2ee2990a..bc4f2aae1549e 100644 --- a/web/src/components/Settings/MyAccountSection.tsx +++ b/web/src/components/Settings/MyAccountSection.tsx @@ -1,7 +1,5 @@ import { Button, Dropdown, Menu, MenuButton, MenuItem } from ""@mui/joy""; import { MoreVerticalIcon, PenLineIcon } from ""lucide-react""; -import { memoServiceClient } from ""@/grpcweb""; -import { downloadFileFromUrl } from ""@/helpers/utils""; import useCurrentUser from ""@/hooks/useCurrentUser""; import { useTranslate } from ""@/utils/i18n""; import showChangePasswordDialog from ""../ChangePasswordDialog""; @@ -13,13 +11,6 @@ const MyAccountSection = () => { const t = useTranslate(); const user = useCurrentUser(); - const downloadExportedMemos = async (user: any) => { - const { content } = await memoServiceClient.exportMemos({ filter: `creator == ""${user.name}""` }); - const downloadUrl = window.URL.createObjectURL(new Blob([content])); - downloadFileFromUrl(downloadUrl, ""memos-export.zip""); - URL.revokeObjectURL(downloadUrl); - }; - return (

{t(""setting.account-section.title"")}

@@ -46,7 +37,6 @@ const MyAccountSection = () => { {t(""setting.account-section.change-password"")} - downloadExportedMemos(user)}>{t(""setting.account-section.export-memos"")}
",chore,retire export memos 8773a3d2c1cd90464c2d2c65e5a937429780495d,2024-02-04 20:15:51,Steven,chore: tweak assets folder,False,"diff --git a/web/src/wasm/gomark.wasm b/web/src/assets/gomark.wasm similarity index 99% rename from web/src/wasm/gomark.wasm rename to web/src/assets/gomark.wasm index 90a479f04f378..6d6ea00200570 100755 Binary files a/web/src/wasm/gomark.wasm and b/web/src/assets/gomark.wasm differ diff --git a/web/src/wasm/wasm_exec.js b/web/src/assets/wasm_exec.js similarity index 100% rename from web/src/wasm/wasm_exec.js rename to web/src/assets/wasm_exec.js diff --git a/web/src/main.tsx b/web/src/main.tsx index d0980f849aefa..abad1e073a3d2 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -11,12 +11,12 @@ import ""./less/highlight.less""; import router from ""./router""; import store from ""./store""; import theme from ""./theme""; -import wasmUrl from ""./wasm/gomark.wasm?url""; -import ""./wasm/wasm_exec.js""; +import gomarkWasm from ""./assets/gomark.wasm?url""; +import ""./assets/wasm_exec.js""; (async () => { const go = new window.Go(); - const responsePromise = fetch(wasmUrl); + const responsePromise = fetch(gomarkWasm); const { instance } = await WebAssembly.instantiateStreaming(responsePromise, go.importObject); go.run(instance);",chore,tweak assets folder b938c8d7b65dba60c6c9fe1851e8b6cdb2d6de88,2023-10-07 22:12:02,Steven,chore: only show comments in memo detail page,False,"diff --git a/api/v1/memo.go b/api/v1/memo.go index 73d56ea899b01..ddd43411178a6 100644 --- a/api/v1/memo.go +++ b/api/v1/memo.go @@ -144,7 +144,10 @@ func (s *APIV1Service) registerMemoRoutes(g *echo.Group) { // @Router /api/v1/memo [GET] func (s *APIV1Service) GetMemoList(c echo.Context) error { ctx := c.Request().Context() - findMemoMessage := &store.FindMemo{} + hasParentFlag := false + findMemoMessage := &store.FindMemo{ + HasParent: &hasParentFlag, + } if userID, err := util.ConvertStringToInt32(c.QueryParam(""creatorId"")); err == nil { findMemoMessage.CreatorID = &userID } @@ -404,7 +407,10 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error { // - creatorUsername is listed at ./web/src/helpers/api.ts:82, but it's not present here func (s *APIV1Service) GetAllMemos(c echo.Context) error { ctx := c.Request().Context() - findMemoMessage := &store.FindMemo{} + hasParentFlag := false + findMemoMessage := &store.FindMemo{ + HasParent: &hasParentFlag, + } _, ok := c.Get(userIDContextKey).(int32) if !ok { findMemoMessage.VisibilityList = []store.Visibility{store.Public} @@ -461,8 +467,10 @@ func (s *APIV1Service) GetAllMemos(c echo.Context) error { func (s *APIV1Service) GetMemoStats(c echo.Context) error { ctx := c.Request().Context() normalStatus := store.Normal + hasParentFlag := false findMemoMessage := &store.FindMemo{ RowStatus: &normalStatus, + HasParent: &hasParentFlag, } if creatorID, err := util.ConvertStringToInt32(c.QueryParam(""creatorId"")); err == nil { findMemoMessage.CreatorID = &creatorID diff --git a/store/db/sqlite/memo.go b/store/db/sqlite/memo.go index a864a22cf0d64..d021539163a81 100644 --- a/store/db/sqlite/memo.go +++ b/store/db/sqlite/memo.go @@ -65,9 +65,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo if v := find.CreatedTsAfter; v != nil { where, args = append(where, ""memo.created_ts > ?""), append(args, *v) } - if v := find.Pinned; v != nil { - where = append(where, ""memo_organizer.pinned = 1"") - } if v := find.ContentSearch; len(v) != 0 { for _, s := range v { where, args = append(where, ""memo.content LIKE ?""), append(args, ""%""+s+""%"") @@ -81,6 +78,17 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo } where = append(where, fmt.Sprintf(""memo.visibility in (%s)"", strings.Join(list, "",""))) } + if v := find.Pinned; v != nil { + where = append(where, ""memo_organizer.pinned = 1"") + } + if v := find.HasParent; v != nil { + if *v { + where = append(where, ""parent_id IS NOT NULL"") + } else { + where = append(where, ""parent_id IS NULL"") + } + } + orders := []string{""pinned DESC""} if find.OrderByUpdatedTs { orders = append(orders, ""updated_ts DESC"") @@ -99,6 +107,15 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo memo.content AS content, memo.visibility AS visibility, CASE WHEN memo_organizer.pinned = 1 THEN 1 ELSE 0 END AS pinned, + ( + SELECT + related_memo_id + FROM + memo_relation + WHERE + memo_relation.memo_id = memo.id AND memo_relation.type = 'COMMENT' + LIMIT 1 + ) AS parent_id, GROUP_CONCAT(resource.id) AS resource_id_list, ( SELECT @@ -145,6 +162,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo &memo.Content, &memo.Visibility, &memo.Pinned, + &memo.ParentID, &memoResourceIDList, &memoRelationList, ); err != nil { @@ -184,10 +202,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo RelatedMemoID: relatedMemoID, Type: relationType, }) - // Set the first parent ID if relation type is comment. - if memo.ParentID == nil && memoID == memo.ID && relationType == store.MemoRelationComment { - memo.ParentID = &relatedMemoID - } } } list = append(list, &memo) diff --git a/store/memo.go b/store/memo.go index 338d6c4e6e2ca..e5afa05bb6bf8 100644 --- a/store/memo.go +++ b/store/memo.go @@ -60,9 +60,10 @@ type FindMemo struct { CreatedTsBefore *int64 // Domain specific fields - Pinned *bool ContentSearch []string VisibilityList []Visibility + Pinned *bool + HasParent *bool // Pagination Limit *int diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsx index d251dcd83bbdc..bad0ef10d2a48 100644 --- a/web/src/components/Memo.tsx +++ b/web/src/components/Memo.tsx @@ -245,18 +245,26 @@ const Memo: React.FC = (props: Props) => {
- - {memo.pinned ? : } - {memo.pinned ? t(""common.unpin"") : t(""common.pin"")} - + {!memo.parent && ( + + {memo.pinned ? ( + + ) : ( + + )} + {memo.pinned ? t(""common.unpin"") : t(""common.pin"")} + + )} {t(""common.edit"")} - - - {t(""common.mark"")} - + {!memo.parent && ( + + + {t(""common.mark"")} + + )} @@ -290,12 +298,6 @@ const Memo: React.FC = (props: Props) => {
{creator && ( <> - - - #{memo.id} - - - diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsx index e48ab522b4fd7..345a5511940a1 100644 --- a/web/src/components/MemoList.tsx +++ b/web/src/components/MemoList.tsx @@ -63,7 +63,7 @@ const MemoList: React.FC = () => { return shouldShow; }) : memos - ).filter((memo) => memo.creatorUsername === username && memo.rowStatus === ""NORMAL""); + ).filter((memo) => memo.creatorUsername === username && memo.rowStatus === ""NORMAL"" && !memo.parent); const pinnedMemos = shownMemos.filter((m) => m.pinned); const unpinnedMemos = shownMemos.filter((m) => !m.pinned); diff --git a/web/src/components/MemoResource.tsx b/web/src/components/MemoResource.tsx index 52e8c918f80ea..c5ef9299b308c 100644 --- a/web/src/components/MemoResource.tsx +++ b/web/src/components/MemoResource.tsx @@ -16,22 +16,18 @@ const MemoResource: React.FC = (props: Props) => { }; return ( - <> -
- {resource.type.startsWith(""audio"") ? ( - <> - - - ) : ( - <> - - - {resource.filename} - - - )} -
- +
+ {resource.type.startsWith(""audio"") ? ( + + ) : ( + <> + + + {resource.filename} + + + )} +
); }; diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx index 706fec61f0567..a2cfe66d85fa3 100644 --- a/web/src/pages/Explore.tsx +++ b/web/src/pages/Explore.tsx @@ -54,7 +54,7 @@ const Explore = () => { : memos; const sortedMemos = fetchedMemos - .filter((m) => m.rowStatus === ""NORMAL"" && m.visibility !== ""PRIVATE"") + .filter((m) => m.rowStatus === ""NORMAL"" && m.visibility !== ""PRIVATE"" && !m.parent) .sort((mi, mj) => mj.displayTs - mi.displayTs); useEffect(() => { diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx index f580624b2d3a4..19671ca9276f1 100644 --- a/web/src/pages/MemoDetail.tsx +++ b/web/src/pages/MemoDetail.tsx @@ -114,6 +114,10 @@ const MemoDetail = () => {
{getDateTimeString(memo.displayTs)} + + + #{memo.id} +
{memo.parent && (
@@ -127,10 +131,6 @@ const MemoDetail = () => {
- - #{memo.id} - - ",chore,only show comments in memo detail page 238f8969076eb59e3abc84ffa85a5d2654e4e6f2,2023-08-05 19:00:23,boojack,feat: add system service (#2083),False,"diff --git a/api/v1/system.go b/api/v1/system.go index 3c8b2578abbc5..07e8940308f03 100644 --- a/api/v1/system.go +++ b/api/v1/system.go @@ -82,10 +82,6 @@ func (s *APIV1Service) registerSystemRoutes(g *echo.Group) { } if hostUser != nil { systemStatus.Host = &User{ID: hostUser.ID} - // data desensitize - systemStatus.Host.OpenID = """" - systemStatus.Host.Email = """" - systemStatus.Host.AvatarURL = """" } systemSettingList, err := s.Store.ListSystemSettings(ctx, &store.FindSystemSetting{}) diff --git a/api/v2/acl.go b/api/v2/acl.go index 2dba3ea145fee..c4cf022b836b4 100644 --- a/api/v2/acl.go +++ b/api/v2/acl.go @@ -28,8 +28,9 @@ const ( ) var authenticationAllowlistMethods = map[string]bool{ - ""/memos.api.v2.UserService/GetUser"": true, - ""/memos.api.v2.MemoService/ListMemos"": true, + ""/memos.api.v2.SystemService/GetSystemInfo"": true, + ""/memos.api.v2.UserService/GetUser"": true, + ""/memos.api.v2.MemoService/ListMemos"": true, } // IsAuthenticationAllowed returns whether the method is exempted from authentication. diff --git a/api/v2/system_service.go b/api/v2/system_service.go new file mode 100644 index 0000000000000..cd118c423d7a1 --- /dev/null +++ b/api/v2/system_service.go @@ -0,0 +1,55 @@ +package v2 + +import ( + ""context"" + ""os"" + + apiv2pb ""github.com/usememos/memos/proto/gen/api/v2"" + ""github.com/usememos/memos/server/profile"" + ""github.com/usememos/memos/store"" + ""google.golang.org/grpc/codes"" + ""google.golang.org/grpc/status"" +) + +type SystemService struct { + apiv2pb.UnimplementedSystemServiceServer + + Profile *profile.Profile + Store *store.Store +} + +// NewSystemService creates a new SystemService. +func NewSystemService(profile *profile.Profile, store *store.Store) *SystemService { + return &SystemService{ + Profile: profile, + Store: store, + } +} + +func (s *SystemService) GetSystemInfo(ctx context.Context, _ *apiv2pb.GetSystemInfoRequest) (*apiv2pb.GetSystemInfoResponse, error) { + defaultSystemInfo := &apiv2pb.SystemInfo{} + + // Get the database size if the user is a host. + userIDPtr := ctx.Value(UserIDContextKey) + if userIDPtr != nil { + userID := userIDPtr.(int32) + user, err := s.Store.GetUser(ctx, &store.FindUser{ + ID: &userID, + }) + if err != nil { + return nil, status.Errorf(codes.Internal, ""failed to get user: %v"", err) + } + if user != nil && user.Role == store.RoleHost { + fi, err := os.Stat(s.Profile.DSN) + if err != nil { + return nil, status.Errorf(codes.Internal, ""failed to get file info: %v"", err) + } + defaultSystemInfo.DbSize = fi.Size() + } + } + + response := &apiv2pb.GetSystemInfoResponse{ + SystemInfo: defaultSystemInfo, + } + return response, nil +} diff --git a/api/v2/v2.go b/api/v2/v2.go index a8aaf63f85011..a2ba08320d8b0 100644 --- a/api/v2/v2.go +++ b/api/v2/v2.go @@ -29,6 +29,7 @@ func NewAPIV2Service(secret string, profile *profile.Profile, store *store.Store authProvider.AuthenticationInterceptor, ), ) + apiv2pb.RegisterSystemServiceServer(grpcServer, NewSystemService(profile, store)) apiv2pb.RegisterUserServiceServer(grpcServer, NewUserService(store)) apiv2pb.RegisterMemoServiceServer(grpcServer, NewMemoService(store)) apiv2pb.RegisterTagServiceServer(grpcServer, NewTagService(store)) @@ -60,6 +61,9 @@ func (s *APIV2Service) RegisterGateway(ctx context.Context, e *echo.Echo) error } gwMux := grpcRuntime.NewServeMux() + if err := apiv2pb.RegisterSystemServiceHandler(context.Background(), gwMux, conn); err != nil { + return err + } if err := apiv2pb.RegisterUserServiceHandler(context.Background(), gwMux, conn); err != nil { return err } diff --git a/proto/api/v2/system_service.proto b/proto/api/v2/system_service.proto new file mode 100644 index 0000000000000..d768294819708 --- /dev/null +++ b/proto/api/v2/system_service.proto @@ -0,0 +1,29 @@ +syntax = ""proto3""; + +package memos.api.v2; + +import ""google/api/annotations.proto""; + +option go_package = ""gen/api/v2""; + +service SystemService { + rpc GetSystemInfo(GetSystemInfoRequest) returns (GetSystemInfoResponse) { + option (google.api.http) = {get: ""/api/v2/system/info""}; + } +} + +message SystemInfo { + string version = 1; + string mode = 2; + bool allow_registration = 3; + bool disable_password_login = 4; + string additional_script = 5; + string additional_style = 6; + int64 db_size = 7; +} + +message GetSystemInfoRequest {} + +message GetSystemInfoResponse { + SystemInfo system_info = 1; +} diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.md index 5765ba626727a..58389cdb70529 100644 --- a/proto/gen/api/v2/README.md +++ b/proto/gen/api/v2/README.md @@ -17,6 +17,13 @@ - [MemoService](#memos-api-v2-MemoService) +- [api/v2/system_service.proto](#api_v2_system_service-proto) + - [GetSystemInfoRequest](#memos-api-v2-GetSystemInfoRequest) + - [GetSystemInfoResponse](#memos-api-v2-GetSystemInfoResponse) + - [SystemInfo](#memos-api-v2-SystemInfo) + + - [SystemService](#memos-api-v2-SystemService) + - [api/v2/tag_service.proto](#api_v2_tag_service-proto) - [ListTagsRequest](#memos-api-v2-ListTagsRequest) - [ListTagsResponse](#memos-api-v2-ListTagsResponse) @@ -195,6 +202,78 @@ + +

Top

+ +## api/v2/system_service.proto + + + + + +### GetSystemInfoRequest + + + + + + + + + +### GetSystemInfoResponse + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| system_info | [SystemInfo](#memos-api-v2-SystemInfo) | | | + + + + + + + + +### SystemInfo + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| version | [string](#string) | | | +| mode | [string](#string) | | | +| allow_registration | [bool](#bool) | | | +| disable_password_login | [bool](#bool) | | | +| additional_script | [string](#string) | | | +| additional_style | [string](#string) | | | +| db_size | [int64](#int64) | | | + + + + + + + + + + + + + + +### SystemService + + +| Method Name | Request Type | Response Type | Description | +| ----------- | ------------ | ------------- | ------------| +| GetSystemInfo | [GetSystemInfoRequest](#memos-api-v2-GetSystemInfoRequest) | [GetSystemInfoResponse](#memos-api-v2-GetSystemInfoResponse) | | + + + + +

Top

diff --git a/proto/gen/api/v2/system_service.pb.go b/proto/gen/api/v2/system_service.pb.go new file mode 100644 index 0000000000000..5c5d98a444e1f --- /dev/null +++ b/proto/gen/api/v2/system_service.pb.go @@ -0,0 +1,348 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.31.0 +// protoc (unknown) +// source: api/v2/system_service.proto + +package apiv2 + +import ( + _ ""google.golang.org/genproto/googleapis/api/annotations"" + protoreflect ""google.golang.org/protobuf/reflect/protoreflect"" + protoimpl ""google.golang.org/protobuf/runtime/protoimpl"" + reflect ""reflect"" + sync ""sync"" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type SystemInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Version string `protobuf:""bytes,1,opt,name=version,proto3"" json:""version,omitempty""` + Mode string `protobuf:""bytes,2,opt,name=mode,proto3"" json:""mode,omitempty""` + AllowRegistration bool `protobuf:""varint,3,opt,name=allow_registration,json=allowRegistration,proto3"" json:""allow_registration,omitempty""` + DisablePasswordLogin bool `protobuf:""varint,4,opt,name=disable_password_login,json=disablePasswordLogin,proto3"" json:""disable_password_login,omitempty""` + AdditionalScript string `protobuf:""bytes,5,opt,name=additional_script,json=additionalScript,proto3"" json:""additional_script,omitempty""` + AdditionalStyle string `protobuf:""bytes,6,opt,name=additional_style,json=additionalStyle,proto3"" json:""additional_style,omitempty""` + DbSize int64 `protobuf:""varint,7,opt,name=db_size,json=dbSize,proto3"" json:""db_size,omitempty""` +} + +func (x *SystemInfo) Reset() { + *x = SystemInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_system_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SystemInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemInfo) ProtoMessage() {} + +func (x *SystemInfo) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_system_service_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemInfo.ProtoReflect.Descriptor instead. +func (*SystemInfo) Descriptor() ([]byte, []int) { + return file_api_v2_system_service_proto_rawDescGZIP(), []int{0} +} + +func (x *SystemInfo) GetVersion() string { + if x != nil { + return x.Version + } + return """" +} + +func (x *SystemInfo) GetMode() string { + if x != nil { + return x.Mode + } + return """" +} + +func (x *SystemInfo) GetAllowRegistration() bool { + if x != nil { + return x.AllowRegistration + } + return false +} + +func (x *SystemInfo) GetDisablePasswordLogin() bool { + if x != nil { + return x.DisablePasswordLogin + } + return false +} + +func (x *SystemInfo) GetAdditionalScript() string { + if x != nil { + return x.AdditionalScript + } + return """" +} + +func (x *SystemInfo) GetAdditionalStyle() string { + if x != nil { + return x.AdditionalStyle + } + return """" +} + +func (x *SystemInfo) GetDbSize() int64 { + if x != nil { + return x.DbSize + } + return 0 +} + +type GetSystemInfoRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *GetSystemInfoRequest) Reset() { + *x = GetSystemInfoRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_system_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetSystemInfoRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetSystemInfoRequest) ProtoMessage() {} + +func (x *GetSystemInfoRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_system_service_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetSystemInfoRequest.ProtoReflect.Descriptor instead. +func (*GetSystemInfoRequest) Descriptor() ([]byte, []int) { + return file_api_v2_system_service_proto_rawDescGZIP(), []int{1} +} + +type GetSystemInfoResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SystemInfo *SystemInfo `protobuf:""bytes,1,opt,name=system_info,json=systemInfo,proto3"" json:""system_info,omitempty""` +} + +func (x *GetSystemInfoResponse) Reset() { + *x = GetSystemInfoResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_system_service_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetSystemInfoResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetSystemInfoResponse) ProtoMessage() {} + +func (x *GetSystemInfoResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_system_service_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetSystemInfoResponse.ProtoReflect.Descriptor instead. +func (*GetSystemInfoResponse) Descriptor() ([]byte, []int) { + return file_api_v2_system_service_proto_rawDescGZIP(), []int{2} +} + +func (x *GetSystemInfoResponse) GetSystemInfo() *SystemInfo { + if x != nil { + return x.SystemInfo + } + return nil +} + +var File_api_v2_system_service_proto protoreflect.FileDescriptor + +var file_api_v2_system_service_proto_rawDesc = []byte{ + 0x0a, 0x1b, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6d, + 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, 0x02, 0x0a, 0x0a, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, + 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x16, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x2b, 0x0a, 0x11, 0x61, + 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x61, 0x6c, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x61, 0x64, 0x64, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x74, + 0x79, 0x6c, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x62, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x64, 0x62, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x16, 0x0a, 0x14, + 0x47, 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x52, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, + 0x0b, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x32, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x32, 0x86, 0x01, 0x0a, 0x0d, 0x53, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x75, 0x0a, 0x0d, 0x47, 0x65, + 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x22, 0x2e, 0x6d, 0x65, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x23, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, + 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x69, 0x6e, 0x66, + 0x6f, 0x42, 0xaa, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x12, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, + 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, + 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, + 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, + 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, + 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, + 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_api_v2_system_service_proto_rawDescOnce sync.Once + file_api_v2_system_service_proto_rawDescData = file_api_v2_system_service_proto_rawDesc +) + +func file_api_v2_system_service_proto_rawDescGZIP() []byte { + file_api_v2_system_service_proto_rawDescOnce.Do(func() { + file_api_v2_system_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_api_v2_system_service_proto_rawDescData) + }) + return file_api_v2_system_service_proto_rawDescData +} + +var file_api_v2_system_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_api_v2_system_service_proto_goTypes = []interface{}{ + (*SystemInfo)(nil), // 0: memos.api.v2.SystemInfo + (*GetSystemInfoRequest)(nil), // 1: memos.api.v2.GetSystemInfoRequest + (*GetSystemInfoResponse)(nil), // 2: memos.api.v2.GetSystemInfoResponse +} +var file_api_v2_system_service_proto_depIdxs = []int32{ + 0, // 0: memos.api.v2.GetSystemInfoResponse.system_info:type_name -> memos.api.v2.SystemInfo + 1, // 1: memos.api.v2.SystemService.GetSystemInfo:input_type -> memos.api.v2.GetSystemInfoRequest + 2, // 2: memos.api.v2.SystemService.GetSystemInfo:output_type -> memos.api.v2.GetSystemInfoResponse + 2, // [2:3] is the sub-list for method output_type + 1, // [1:2] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_api_v2_system_service_proto_init() } +func file_api_v2_system_service_proto_init() { + if File_api_v2_system_service_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_api_v2_system_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SystemInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_api_v2_system_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetSystemInfoRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_api_v2_system_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetSystemInfoResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_api_v2_system_service_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_api_v2_system_service_proto_goTypes, + DependencyIndexes: file_api_v2_system_service_proto_depIdxs, + MessageInfos: file_api_v2_system_service_proto_msgTypes, + }.Build() + File_api_v2_system_service_proto = out.File + file_api_v2_system_service_proto_rawDesc = nil + file_api_v2_system_service_proto_goTypes = nil + file_api_v2_system_service_proto_depIdxs = nil +} diff --git a/proto/gen/api/v2/system_service.pb.gw.go b/proto/gen/api/v2/system_service.pb.gw.go new file mode 100644 index 0000000000000..bd9182dd25bc5 --- /dev/null +++ b/proto/gen/api/v2/system_service.pb.gw.go @@ -0,0 +1,155 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: api/v2/system_service.proto + +/* +Package apiv2 is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package apiv2 + +import ( + ""context"" + ""io"" + ""net/http"" + + ""github.com/grpc-ecosystem/grpc-gateway/v2/runtime"" + ""github.com/grpc-ecosystem/grpc-gateway/v2/utilities"" + ""google.golang.org/grpc"" + ""google.golang.org/grpc/codes"" + ""google.golang.org/grpc/grpclog"" + ""google.golang.org/grpc/metadata"" + ""google.golang.org/grpc/status"" + ""google.golang.org/protobuf/proto"" +) + +// Suppress ""imported and not used"" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join + +func request_SystemService_GetSystemInfo_0(ctx context.Context, marshaler runtime.Marshaler, client SystemServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetSystemInfoRequest + var metadata runtime.ServerMetadata + + msg, err := client.GetSystemInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_SystemService_GetSystemInfo_0(ctx context.Context, marshaler runtime.Marshaler, server SystemServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetSystemInfoRequest + var metadata runtime.ServerMetadata + + msg, err := server.GetSystemInfo(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterSystemServiceHandlerServer registers the http handlers for service SystemService to ""mux"". +// UnaryRPC :call SystemServiceServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterSystemServiceHandlerFromEndpoint instead. +func RegisterSystemServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server SystemServiceServer) error { + + mux.Handle(""GET"", pattern_SystemService_GetSystemInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, ""/memos.api.v2.SystemService/GetSystemInfo"", runtime.WithHTTPPathPattern(""/api/v2/system/info"")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SystemService_GetSystemInfo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_SystemService_GetSystemInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +// RegisterSystemServiceHandlerFromEndpoint is same as RegisterSystemServiceHandler but +// automatically dials to ""endpoint"" and closes the connection when ""ctx"" gets done. +func RegisterSystemServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.DialContext(ctx, endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof(""Failed to close conn to %s: %v"", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof(""Failed to close conn to %s: %v"", endpoint, cerr) + } + }() + }() + + return RegisterSystemServiceHandler(ctx, mux, conn) +} + +// RegisterSystemServiceHandler registers the http handlers for service SystemService to ""mux"". +// The handlers forward requests to the grpc endpoint over ""conn"". +func RegisterSystemServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterSystemServiceHandlerClient(ctx, mux, NewSystemServiceClient(conn)) +} + +// RegisterSystemServiceHandlerClient registers the http handlers for service SystemService +// to ""mux"". The handlers forward requests to the grpc endpoint over the given implementation of ""SystemServiceClient"". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in ""SystemServiceClient"" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// ""SystemServiceClient"" to call the correct interceptors. +func RegisterSystemServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client SystemServiceClient) error { + + mux.Handle(""GET"", pattern_SystemService_GetSystemInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, ""/memos.api.v2.SystemService/GetSystemInfo"", runtime.WithHTTPPathPattern(""/api/v2/system/info"")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_SystemService_GetSystemInfo_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_SystemService_GetSystemInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_SystemService_GetSystemInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{""api"", ""v2"", ""system"", ""info""}, """")) +) + +var ( + forward_SystemService_GetSystemInfo_0 = runtime.ForwardResponseMessage +) diff --git a/proto/gen/api/v2/system_service_grpc.pb.go b/proto/gen/api/v2/system_service_grpc.pb.go new file mode 100644 index 0000000000000..dfce22db85b66 --- /dev/null +++ b/proto/gen/api/v2/system_service_grpc.pb.go @@ -0,0 +1,109 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: api/v2/system_service.proto + +package apiv2 + +import ( + context ""context"" + grpc ""google.golang.org/grpc"" + codes ""google.golang.org/grpc/codes"" + status ""google.golang.org/grpc/status"" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 + +const ( + SystemService_GetSystemInfo_FullMethodName = ""/memos.api.v2.SystemService/GetSystemInfo"" +) + +// SystemServiceClient is the client API for SystemService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type SystemServiceClient interface { + GetSystemInfo(ctx context.Context, in *GetSystemInfoRequest, opts ...grpc.CallOption) (*GetSystemInfoResponse, error) +} + +type systemServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewSystemServiceClient(cc grpc.ClientConnInterface) SystemServiceClient { + return &systemServiceClient{cc} +} + +func (c *systemServiceClient) GetSystemInfo(ctx context.Context, in *GetSystemInfoRequest, opts ...grpc.CallOption) (*GetSystemInfoResponse, error) { + out := new(GetSystemInfoResponse) + err := c.cc.Invoke(ctx, SystemService_GetSystemInfo_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// SystemServiceServer is the server API for SystemService service. +// All implementations must embed UnimplementedSystemServiceServer +// for forward compatibility +type SystemServiceServer interface { + GetSystemInfo(context.Context, *GetSystemInfoRequest) (*GetSystemInfoResponse, error) + mustEmbedUnimplementedSystemServiceServer() +} + +// UnimplementedSystemServiceServer must be embedded to have forward compatible implementations. +type UnimplementedSystemServiceServer struct { +} + +func (UnimplementedSystemServiceServer) GetSystemInfo(context.Context, *GetSystemInfoRequest) (*GetSystemInfoResponse, error) { + return nil, status.Errorf(codes.Unimplemented, ""method GetSystemInfo not implemented"") +} +func (UnimplementedSystemServiceServer) mustEmbedUnimplementedSystemServiceServer() {} + +// UnsafeSystemServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to SystemServiceServer will +// result in compilation errors. +type UnsafeSystemServiceServer interface { + mustEmbedUnimplementedSystemServiceServer() +} + +func RegisterSystemServiceServer(s grpc.ServiceRegistrar, srv SystemServiceServer) { + s.RegisterService(&SystemService_ServiceDesc, srv) +} + +func _SystemService_GetSystemInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetSystemInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SystemServiceServer).GetSystemInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: SystemService_GetSystemInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SystemServiceServer).GetSystemInfo(ctx, req.(*GetSystemInfoRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// SystemService_ServiceDesc is the grpc.ServiceDesc for SystemService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var SystemService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: ""memos.api.v2.SystemService"", + HandlerType: (*SystemServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: ""GetSystemInfo"", + Handler: _SystemService_GetSystemInfo_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: ""api/v2/system_service.proto"", +} diff --git a/web/.prettierrc b/web/.prettierrc deleted file mode 100644 index 6e0dd68620068..0000000000000 --- a/web/.prettierrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - ""printWidth"": 140, - ""useTabs"": false, - ""semi"": true, - ""singleQuote"": false, - ""plugins"": [""@ianvs/prettier-plugin-sort-imports""], - ""importOrder"": ["""", """", ""^@/(.*)$"", ""^[./]"", "".less$""] -} diff --git a/web/.prettierrc.js b/web/.prettierrc.js new file mode 100644 index 0000000000000..09a8189d10868 --- /dev/null +++ b/web/.prettierrc.js @@ -0,0 +1,8 @@ +module.exports = { + printWidth: 140, + useTabs: false, + semi: true, + singleQuote: false, + plugins: [require.resolve(""@trivago/prettier-plugin-sort-imports"")], + importOrder: ["""", """", ""^@/((?!less).+)"", ""^[./]"", ""^(.+).less""], +}; diff --git a/web/package.json b/web/package.json index 2b1e84a3ea6d3..4fbfde12c2d07 100644 --- a/web/package.json +++ b/web/package.json @@ -38,7 +38,7 @@ ""zustand"": ""^4.3.6"" }, ""devDependencies"": { - ""@ianvs/prettier-plugin-sort-imports"": ""^4.1.0"", + ""@trivago/prettier-plugin-sort-imports"": ""^3.2.0"", ""@types/lodash-es"": ""^4.17.5"", ""@types/node"": ""^18.0.3"", ""@types/qs"": ""^6.9.7"", @@ -57,7 +57,7 @@ ""eslint-plugin-react"": ""^7.27.1"", ""less"": ""^4.1.1"", ""postcss"": ""^8.4.21"", - ""prettier"": ""2.5.1"", + ""prettier"": ""2.6.2"", ""terser"": ""^5.16.1"", ""typescript"": ""^5.0.4"", ""vite"": ""^4.2.1"" diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 7928531e7b68b..866bbada0e966 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -91,9 +91,9 @@ dependencies: version: 4.3.6(react@18.2.0) devDependencies: - '@ianvs/prettier-plugin-sort-imports': - specifier: ^4.1.0 - version: 4.1.0(prettier@2.5.1) + '@trivago/prettier-plugin-sort-imports': + specifier: ^3.2.0 + version: 3.2.0(prettier@2.6.2) '@types/lodash-es': specifier: ^4.17.5 version: 4.17.5 @@ -138,7 +138,7 @@ devDependencies: version: 8.6.0(eslint@8.46.0) eslint-plugin-prettier: specifier: ^4.2.1 - version: 4.2.1(eslint-config-prettier@8.6.0)(eslint@8.46.0)(prettier@2.5.1) + version: 4.2.1(eslint-config-prettier@8.6.0)(eslint@8.46.0)(prettier@2.6.2) eslint-plugin-react: specifier: ^7.27.1 version: 7.27.1(eslint@8.46.0) @@ -149,8 +149,8 @@ devDependencies: specifier: ^8.4.21 version: 8.4.21 prettier: - specifier: 2.5.1 - version: 2.5.1 + specifier: 2.6.2 + version: 2.6.2 terser: specifier: ^5.16.1 version: 5.16.1 @@ -174,6 +174,7 @@ packages: dependencies: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 + dev: false /@babel/code-frame@7.22.5: resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} @@ -185,6 +186,30 @@ packages: resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==} engines: {node: '>=6.9.0'} + /@babel/core@7.13.10: + resolution: {integrity: sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.22.5 + '@babel/generator': 7.22.9 + '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.13.10) + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.13.10) + '@babel/helpers': 7.22.6 + '@babel/parser': 7.22.7 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.8(supports-color@5.5.0) + '@babel/types': 7.22.5 + convert-source-map: 1.9.0 + debug: 4.3.4(supports-color@5.5.0) + gensync: 1.0.0-beta.2 + json5: 2.2.3 + lodash: 4.17.21 + semver: 6.3.1 + source-map: 0.5.7 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/core@7.22.9: resolution: {integrity: sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==} engines: {node: '>=6.9.0'} @@ -206,6 +231,15 @@ packages: semver: 6.3.1 transitivePeerDependencies: - supports-color + dev: false + + /@babel/generator@7.13.9: + resolution: {integrity: sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==} + dependencies: + '@babel/types': 7.22.5 + jsesc: 2.5.2 + source-map: 0.5.7 + dev: true /@babel/generator@7.22.9: resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==} @@ -223,6 +257,20 @@ packages: '@babel/types': 7.22.5 dev: false + /@babel/helper-compilation-targets@7.22.9(@babel/core@7.13.10): + resolution: {integrity: sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/compat-data': 7.22.9 + '@babel/core': 7.13.10 + '@babel/helper-validator-option': 7.22.5 + browserslist: 4.21.10 + lru-cache: 5.1.1 + semver: 6.3.1 + dev: true + /@babel/helper-compilation-targets@7.22.9(@babel/core@7.22.9): resolution: {integrity: sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==} engines: {node: '>=6.9.0'} @@ -235,6 +283,7 @@ packages: browserslist: 4.21.10 lru-cache: 5.1.1 semver: 6.3.1 + dev: false /@babel/helper-environment-visitor@7.22.5: resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} @@ -259,6 +308,20 @@ packages: dependencies: '@babel/types': 7.22.5 + /@babel/helper-module-transforms@7.22.9(@babel/core@7.13.10): + resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.13.10 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/helper-validator-identifier': 7.22.5 + dev: true + /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.9): resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} engines: {node: '>=6.9.0'} @@ -271,6 +334,7 @@ packages: '@babel/helper-simple-access': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.5 + dev: false /@babel/helper-plugin-utils@7.22.5: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} @@ -319,6 +383,14 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 + /@babel/parser@7.14.6: + resolution: {integrity: sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.22.5 + dev: true + /@babel/parser@7.22.7: resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==} engines: {node: '>=6.0.0'} @@ -351,6 +423,22 @@ packages: '@babel/parser': 7.22.7 '@babel/types': 7.22.5 + /@babel/traverse@7.13.0: + resolution: {integrity: sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==} + dependencies: + '@babel/code-frame': 7.22.5 + '@babel/generator': 7.22.9 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.22.7 + '@babel/types': 7.22.5 + debug: 4.3.4(supports-color@5.5.0) + globals: 11.12.0 + lodash: 4.17.21 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/traverse@7.22.8(supports-color@5.5.0): resolution: {integrity: sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==} engines: {node: '>=6.9.0'} @@ -368,6 +456,14 @@ packages: transitivePeerDependencies: - supports-color + /@babel/types@7.13.0: + resolution: {integrity: sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==} + dependencies: + '@babel/helper-validator-identifier': 7.22.5 + lodash: 4.17.21 + to-fast-properties: 2.0.0 + dev: true + /@babel/types@7.22.5: resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} engines: {node: '>=6.9.0'} @@ -755,26 +851,6 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true - /@ianvs/prettier-plugin-sort-imports@4.1.0(prettier@2.5.1): - resolution: {integrity: sha512-IAXeTLU24k6mRPa6mFbW1qZJ/j0m3OeH44wyijWyr+YqqdNtBnfHxAntOAATS9iDfrT01NesKGsdzqnXdDQa/A==} - peerDependencies: - '@vue/compiler-sfc': '>=3.0.0' - prettier: 2 || 3 - peerDependenciesMeta: - '@vue/compiler-sfc': - optional: true - dependencies: - '@babel/core': 7.22.9 - '@babel/generator': 7.22.9 - '@babel/parser': 7.22.7 - '@babel/traverse': 7.22.8(supports-color@5.5.0) - '@babel/types': 7.22.5 - prettier: 2.5.1 - semver: 7.5.4 - transitivePeerDependencies: - - supports-color - dev: true - /@jridgewell/gen-mapping@0.3.3: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} @@ -1203,6 +1279,23 @@ packages: '@swc/core-win32-x64-msvc': 1.3.73 dev: true + /@trivago/prettier-plugin-sort-imports@3.2.0(prettier@2.6.2): + resolution: {integrity: sha512-DnwLe+z8t/dZX5xBbYZV1+C5STkyK/P6SSq3Nk6NXlJZsgvDZX2eN4ND7bMFgGV/NL/YChWzcNf6ziGba1ktQQ==} + peerDependencies: + prettier: 2.x + dependencies: + '@babel/core': 7.13.10 + '@babel/generator': 7.13.9 + '@babel/parser': 7.14.6 + '@babel/traverse': 7.13.0 + '@babel/types': 7.13.0 + javascript-natural-sort: 0.7.1 + lodash: 4.17.21 + prettier: 2.6.2 + transitivePeerDependencies: + - supports-color + dev: true + /@types/hoist-non-react-statics@3.3.1: resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==} dependencies: @@ -2039,7 +2132,7 @@ packages: eslint: 8.46.0 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.6.0)(eslint@8.46.0)(prettier@2.5.1): + /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.6.0)(eslint@8.46.0)(prettier@2.6.2): resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2052,7 +2145,7 @@ packages: dependencies: eslint: 8.46.0 eslint-config-prettier: 8.6.0(eslint@8.46.0) - prettier: 2.5.1 + prettier: 2.6.2 prettier-linter-helpers: 1.0.0 dev: true @@ -2710,6 +2803,10 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true + /javascript-natural-sort@0.7.1: + resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} + dev: true + /js-cookie@2.2.1: resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==} dev: false @@ -2810,7 +2907,6 @@ packages: /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - dev: false /loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} @@ -3189,8 +3285,8 @@ packages: fast-diff: 1.3.0 dev: true - /prettier@2.5.1: - resolution: {integrity: sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==} + /prettier@2.6.2: + resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==} engines: {node: '>=10.13.0'} hasBin: true dev: true @@ -3551,14 +3647,6 @@ packages: dependencies: lru-cache: 6.0.0 - /semver@7.5.4: - resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} - engines: {node: '>=10'} - hasBin: true - dependencies: - lru-cache: 6.0.0 - dev: true - /set-harmonic-interval@1.0.1: resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==} engines: {node: '>=6.9'} @@ -3612,7 +3700,6 @@ packages: /source-map@0.5.7: resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} engines: {node: '>=0.10.0'} - dev: false /source-map@0.6.1: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} diff --git a/web/src/components/MemoResourceListView.tsx b/web/src/components/MemoResourceListView.tsx index 20ed45111b078..fd6edcd29dc6a 100644 --- a/web/src/components/MemoResourceListView.tsx +++ b/web/src/components/MemoResourceListView.tsx @@ -1,9 +1,9 @@ import { ImageList, ImageListItem, useMediaQuery } from ""@mui/material""; import { absolutifyLink } from ""@/helpers/utils""; import { getResourceType, getResourceUrl } from ""@/utils/resource""; -import SquareDiv from ""./kit/SquareDiv""; import MemoResource from ""./MemoResource""; import showPreviewImageDialog from ""./PreviewImageDialog""; +import SquareDiv from ""./kit/SquareDiv""; import ""@/less/memo-resources.less""; interface Props { diff --git a/web/src/components/ResourceCover.tsx b/web/src/components/ResourceCover.tsx index d7ff04dae6ef4..02e560ad4217e 100644 --- a/web/src/components/ResourceCover.tsx +++ b/web/src/components/ResourceCover.tsx @@ -1,8 +1,8 @@ import React from ""react""; import { getResourceType, getResourceUrl } from ""@/utils/resource""; import Icon from ""./Icon""; -import SquareDiv from ""./kit/SquareDiv""; import showPreviewImageDialog from ""./PreviewImageDialog""; +import SquareDiv from ""./kit/SquareDiv""; import ""@/less/resource-cover.less""; interface ResourceCoverProps { diff --git a/web/src/components/ResourceIcon.tsx b/web/src/components/ResourceIcon.tsx index 0b5d0b8189f30..69b6011706dde 100644 --- a/web/src/components/ResourceIcon.tsx +++ b/web/src/components/ResourceIcon.tsx @@ -1,8 +1,8 @@ import classNames from ""classnames""; import { getResourceUrl } from ""@/utils/resource""; import Icon from ""./Icon""; -import SquareDiv from ""./kit/SquareDiv""; import showPreviewImageDialog from ""./PreviewImageDialog""; +import SquareDiv from ""./kit/SquareDiv""; interface Props { className: string; diff --git a/web/src/components/ResourceItemDropdown.tsx b/web/src/components/ResourceItemDropdown.tsx index 17fcc36103dbe..88e4caaaa814a 100644 --- a/web/src/components/ResourceItemDropdown.tsx +++ b/web/src/components/ResourceItemDropdown.tsx @@ -7,8 +7,8 @@ import { getResourceType, getResourceUrl } from ""@/utils/resource""; import showChangeResourceFilenameDialog from ""./ChangeResourceFilenameDialog""; import { showCommonDialog } from ""./Dialog/CommonDialog""; import Icon from ""./Icon""; -import Dropdown from ""./kit/Dropdown""; import showPreviewImageDialog from ""./PreviewImageDialog""; +import Dropdown from ""./kit/Dropdown""; interface Props { resource: Resource; diff --git a/web/src/components/Settings/SSOSection.tsx b/web/src/components/Settings/SSOSection.tsx index 18e189715b498..ccafa66e6c697 100644 --- a/web/src/components/Settings/SSOSection.tsx +++ b/web/src/components/Settings/SSOSection.tsx @@ -6,8 +6,8 @@ import { useGlobalStore } from ""@/store/module""; import { useTranslate } from ""@/utils/i18n""; import showCreateIdentityProviderDialog from ""../CreateIdentityProviderDialog""; import { showCommonDialog } from ""../Dialog/CommonDialog""; -import Dropdown from ""../kit/Dropdown""; import LearnMore from ""../LearnMore""; +import Dropdown from ""../kit/Dropdown""; interface State { disablePasswordLogin: boolean; diff --git a/web/src/components/Settings/StorageSection.tsx b/web/src/components/Settings/StorageSection.tsx index 183451dd76ef0..757dea8781765 100644 --- a/web/src/components/Settings/StorageSection.tsx +++ b/web/src/components/Settings/StorageSection.tsx @@ -6,9 +6,9 @@ import { useGlobalStore } from ""@/store/module""; import { useTranslate } from ""@/utils/i18n""; import showCreateStorageServiceDialog from ""../CreateStorageServiceDialog""; import { showCommonDialog } from ""../Dialog/CommonDialog""; -import Dropdown from ""../kit/Dropdown""; import LearnMore from ""../LearnMore""; import showUpdateLocalStorageDialog from ""../UpdateLocalStorageDialog""; +import Dropdown from ""../kit/Dropdown""; const StorageSection = () => { const t = useTranslate(); diff --git a/web/src/components/Settings/SystemSection.tsx b/web/src/components/Settings/SystemSection.tsx index c5e4754364988..9891bdaa608e0 100644 --- a/web/src/components/Settings/SystemSection.tsx +++ b/web/src/components/Settings/SystemSection.tsx @@ -5,12 +5,12 @@ import * as api from ""@/helpers/api""; import { formatBytes } from ""@/helpers/utils""; import { useGlobalStore } from ""@/store/module""; import { useTranslate } from ""@/utils/i18n""; +import { showCommonDialog } from ""../Dialog/CommonDialog""; +import showDisablePasswordLoginDialog from ""../DisablePasswordLoginDialog""; import Icon from ""../Icon""; import LearnMore from ""../LearnMore""; import showUpdateCustomizedProfileDialog from ""../UpdateCustomizedProfileDialog""; import ""@/less/settings/system-section.less""; -import { showCommonDialog } from ""../Dialog/CommonDialog""; -import showDisablePasswordLoginDialog from ""../DisablePasswordLoginDialog""; interface State { dbSize: number; diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsx index 120177a1e1b37..3a2728c9c6a9f 100644 --- a/web/src/components/UserBanner.tsx +++ b/web/src/components/UserBanner.tsx @@ -4,8 +4,8 @@ import { useGlobalStore, useUserStore } from ""@/store/module""; import { useTranslate } from ""@/utils/i18n""; import showAboutSiteDialog from ""./AboutSiteDialog""; import Icon from ""./Icon""; -import Dropdown from ""./kit/Dropdown""; import UserAvatar from ""./UserAvatar""; +import Dropdown from ""./kit/Dropdown""; const UserBanner = () => { const t = useTranslate(); diff --git a/web/src/main.tsx b/web/src/main.tsx index 1bf4b38c726c8..375bea98b8fdf 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -2,13 +2,13 @@ import { CssVarsProvider } from ""@mui/joy""; import { createRoot } from ""react-dom/client""; import { Provider } from ""react-redux""; import App from ""./App""; -import store from ""./store""; -import theme from ""./theme""; +import ""./css/global.css""; +import ""./css/tailwind.css""; import ""./helpers/polyfill""; import ""./i18n""; import ""./less/code-highlight.less""; -import ""./css/global.css""; -import ""./css/tailwind.css""; +import store from ""./store""; +import theme from ""./theme""; const container = document.getElementById(""root""); const root = createRoot(container as HTMLElement); diff --git a/web/src/pages/DailyReview.tsx b/web/src/pages/DailyReview.tsx index 1b663b0f530fa..00df16cb6e788 100644 --- a/web/src/pages/DailyReview.tsx +++ b/web/src/pages/DailyReview.tsx @@ -5,9 +5,9 @@ import toast from ""react-hot-toast""; import DailyMemo from ""@/components/DailyMemo""; import Empty from ""@/components/Empty""; import Icon from ""@/components/Icon""; -import DatePicker from ""@/components/kit/DatePicker""; import MobileHeader from ""@/components/MobileHeader""; import showPreviewImageDialog from ""@/components/PreviewImageDialog""; +import DatePicker from ""@/components/kit/DatePicker""; import { DAILY_TIMESTAMP, DEFAULT_MEMO_LIMIT } from ""@/helpers/consts""; import { convertToMillis, getDateStampByDate, getNormalizedDateString, getTimeStampByDate, isFutureDate } from ""@/helpers/datetime""; import useToggle from ""@/hooks/useToggle""; diff --git a/web/src/pages/ResourcesDashboard.tsx b/web/src/pages/ResourcesDashboard.tsx index 70c857f0abd2d..1b2785d98e39f 100644 --- a/web/src/pages/ResourcesDashboard.tsx +++ b/web/src/pages/ResourcesDashboard.tsx @@ -5,11 +5,11 @@ import showCreateResourceDialog from ""@/components/CreateResourceDialog""; import { showCommonDialog } from ""@/components/Dialog/CommonDialog""; import Empty from ""@/components/Empty""; import Icon from ""@/components/Icon""; -import Dropdown from ""@/components/kit/Dropdown""; import MobileHeader from ""@/components/MobileHeader""; import ResourceCard from ""@/components/ResourceCard""; import ResourceItem from ""@/components/ResourceItem""; import ResourceSearchBar from ""@/components/ResourceSearchBar""; +import Dropdown from ""@/components/kit/Dropdown""; import { DEFAULT_MEMO_LIMIT } from ""@/helpers/consts""; import useEvent from ""@/hooks/useEvent""; import useLoading from ""@/hooks/useLoading""; diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.ts index 6d903761b9d55..5cc422374b90a 100644 --- a/web/src/store/module/global.ts +++ b/web/src/store/module/global.ts @@ -1,3 +1,4 @@ +import axios from ""axios""; import * as api from ""@/helpers/api""; import storage from ""@/helpers/storage""; import i18n from ""@/i18n""; @@ -74,6 +75,11 @@ export const useGlobalStore = () => { }, fetchSystemStatus: async () => { const { data: systemStatus } = await api.getSystemStatus(); + // TODO: update this when api v2 is ready. + const { + data: { systemInfo }, + } = await axios.get(""/api/v2/system/info""); + systemStatus.dbSize = Number(systemInfo.dbSize); store.dispatch(setGlobalState({ systemStatus: systemStatus })); return systemStatus; },",feat,add system service (#2083) d2603ee67b21b94318359f00ba0f7068654528ab,2024-02-04 19:06:11,Steven,chore: upgrade frontend dependencies,False,"diff --git a/web/package.json b/web/package.json index da093054679c3..5f8708edf52dd 100644 --- a/web/package.json +++ b/web/package.json @@ -12,7 +12,7 @@ ""@emotion/react"": ""^11.11.3"", ""@emotion/styled"": ""^11.11.0"", ""@matejmazur/react-katex"": ""^3.1.3"", - ""@mui/joy"": ""5.0.0-beta.24"", + ""@mui/joy"": ""5.0.0-beta.25"", ""@reduxjs/toolkit"": ""^1.9.7"", ""axios"": ""^1.6.7"", ""classnames"": ""^2.5.1"", @@ -28,7 +28,7 @@ ""react-hot-toast"": ""^2.4.1"", ""react-i18next"": ""^11.18.6"", ""react-redux"": ""^8.1.3"", - ""react-router-dom"": ""^6.21.3"", + ""react-router-dom"": ""^6.22.0"", ""react-use"": ""^17.5.0"", ""tailwindcss"": ""^3.4.1"", ""textarea-caret"": ""^3.1.0"", @@ -40,14 +40,14 @@ ""@trivago/prettier-plugin-sort-imports"": ""^4.3.0"", ""@types/katex"": ""^0.16.7"", ""@types/lodash-es"": ""^4.17.12"", - ""@types/node"": ""^20.11.7"", + ""@types/node"": ""^20.11.16"", ""@types/qs"": ""^6.9.11"", - ""@types/react"": ""^18.2.48"", + ""@types/react"": ""^18.2.52"", ""@types/react-dom"": ""^18.2.18"", ""@types/textarea-caret"": ""^3.0.3"", ""@types/uuid"": ""^9.0.8"", - ""@typescript-eslint/eslint-plugin"": ""^6.19.1"", - ""@typescript-eslint/parser"": ""^6.19.1"", + ""@typescript-eslint/eslint-plugin"": ""^6.20.0"", + ""@typescript-eslint/parser"": ""^6.20.0"", ""@vitejs/plugin-react"": ""^4.2.1"", ""autoprefixer"": ""^10.4.17"", ""eslint"": ""^8.56.0"", @@ -58,7 +58,7 @@ ""long"": ""^5.2.3"", ""nice-grpc-web"": ""^3.3.2"", ""postcss"": ""^8.4.33"", - ""prettier"": ""^3.2.4"", + ""prettier"": ""^3.2.5"", ""protobufjs"": ""^7.2.6"", ""typescript"": ""^5.3.3"", ""vite"": ""^5.0.12"" diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 10fa0c3e6e3e2..22ec192dfd449 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -10,16 +10,16 @@ overrides: dependencies: '@emotion/react': specifier: ^11.11.3 - version: 11.11.3(@types/react@18.2.48)(react@18.2.0) + version: 11.11.3(@types/react@18.2.52)(react@18.2.0) '@emotion/styled': specifier: ^11.11.0 - version: 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.48)(react@18.2.0) + version: 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.52)(react@18.2.0) '@matejmazur/react-katex': specifier: ^3.1.3 version: 3.1.3(katex@0.16.9)(react@18.2.0) '@mui/joy': - specifier: 5.0.0-beta.24 - version: 5.0.0-beta.24(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0) + specifier: 5.0.0-beta.25 + version: 5.0.0-beta.25(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0) '@reduxjs/toolkit': specifier: ^1.9.7 version: 1.9.7(react-redux@8.1.3)(react@18.2.0) @@ -64,10 +64,10 @@ dependencies: version: 11.18.6(i18next@21.10.0)(react-dom@18.2.0)(react@18.2.0) react-redux: specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.18)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + version: 8.1.3(@types/react-dom@18.2.18)(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) react-router-dom: - specifier: ^6.21.3 - version: 6.21.3(react-dom@18.2.0)(react@18.2.0) + specifier: ^6.22.0 + version: 6.22.0(react-dom@18.2.0)(react@18.2.0) react-use: specifier: ^17.5.0 version: 17.5.0(react-dom@18.2.0)(react@18.2.0) @@ -82,7 +82,7 @@ dependencies: version: 9.0.1 zustand: specifier: ^4.5.0 - version: 4.5.0(@types/react@18.2.48)(react@18.2.0) + version: 4.5.0(@types/react@18.2.52)(react@18.2.0) devDependencies: '@bufbuild/buf': @@ -90,7 +90,7 @@ devDependencies: version: 1.29.0 '@trivago/prettier-plugin-sort-imports': specifier: ^4.3.0 - version: 4.3.0(prettier@3.2.4) + version: 4.3.0(prettier@3.2.5) '@types/katex': specifier: ^0.16.7 version: 0.16.7 @@ -98,14 +98,14 @@ devDependencies: specifier: ^4.17.12 version: 4.17.12 '@types/node': - specifier: ^20.11.7 - version: 20.11.7 + specifier: ^20.11.16 + version: 20.11.16 '@types/qs': specifier: ^6.9.11 version: 6.9.11 '@types/react': - specifier: ^18.2.48 - version: 18.2.48 + specifier: ^18.2.52 + version: 18.2.52 '@types/react-dom': specifier: ^18.2.18 version: 18.2.18 @@ -116,11 +116,11 @@ devDependencies: specifier: ^9.0.8 version: 9.0.8 '@typescript-eslint/eslint-plugin': - specifier: ^6.19.1 - version: 6.19.1(@typescript-eslint/parser@6.19.1)(eslint@8.56.0)(typescript@5.3.3) + specifier: ^6.20.0 + version: 6.20.0(@typescript-eslint/parser@6.20.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': - specifier: ^6.19.1 - version: 6.19.1(eslint@8.56.0)(typescript@5.3.3) + specifier: ^6.20.0 + version: 6.20.0(eslint@8.56.0)(typescript@5.3.3) '@vitejs/plugin-react': specifier: ^4.2.1 version: 4.2.1(vite@5.0.12) @@ -135,7 +135,7 @@ devDependencies: version: 8.10.0(eslint@8.56.0) eslint-plugin-prettier: specifier: ^5.1.3 - version: 5.1.3(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@3.2.4) + version: 5.1.3(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@3.2.5) eslint-plugin-react: specifier: ^7.33.2 version: 7.33.2(eslint@8.56.0) @@ -152,8 +152,8 @@ devDependencies: specifier: ^8.4.33 version: 8.4.33 prettier: - specifier: ^3.2.4 - version: 3.2.4 + specifier: ^3.2.5 + version: 3.2.5 protobufjs: specifier: ^7.2.6 version: 7.2.6 @@ -162,7 +162,7 @@ devDependencies: version: 5.3.3 vite: specifier: ^5.0.12 - version: 5.0.12(@types/node@20.11.7)(less@4.2.0) + version: 5.0.12(@types/node@20.11.16)(less@4.2.0) packages: @@ -544,7 +544,7 @@ packages: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} dev: false - /@emotion/react@11.11.3(@types/react@18.2.48)(react@18.2.0): + /@emotion/react@11.11.3(@types/react@18.2.52)(react@18.2.0): resolution: {integrity: sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==} peerDependencies: '@types/react': '*' @@ -560,7 +560,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 - '@types/react': 18.2.48 + '@types/react': 18.2.52 hoist-non-react-statics: 3.3.2 react: 18.2.0 dev: false @@ -579,7 +579,7 @@ packages: resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==} dev: false - /@emotion/styled@11.11.0(@emotion/react@11.11.3)(@types/react@18.2.48)(react@18.2.0): + /@emotion/styled@11.11.0(@emotion/react@11.11.3)(@types/react@18.2.52)(react@18.2.0): resolution: {integrity: sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==} peerDependencies: '@emotion/react': ^11.0.0-rc.0 @@ -592,11 +592,11 @@ packages: '@babel/runtime': 7.23.9 '@emotion/babel-plugin': 11.11.0 '@emotion/is-prop-valid': 1.2.1 - '@emotion/react': 11.11.3(@types/react@18.2.48)(react@18.2.0) + '@emotion/react': 11.11.3(@types/react@18.2.52)(react@18.2.0) '@emotion/serialize': 1.1.3 '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 - '@types/react': 18.2.48 + '@types/react': 18.2.52 react: 18.2.0 dev: false @@ -850,7 +850,7 @@ packages: debug: 4.3.4 espree: 9.6.1 globals: 13.24.0 - ignore: 5.3.0 + ignore: 5.3.1 import-fresh: 3.3.0 js-yaml: 4.1.0 minimatch: 3.1.2 @@ -870,20 +870,20 @@ packages: '@floating-ui/utils': 0.2.1 dev: false - /@floating-ui/dom@1.6.0: - resolution: {integrity: sha512-SZ0BEXzsaaS6THZfZJUcAobbZTD+MvfGM42bxgeg0Tnkp4/an/avqwAXiVLsFtIBZtfsx3Ymvwx0+KnnhdA/9g==} + /@floating-ui/dom@1.6.1: + resolution: {integrity: sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ==} dependencies: '@floating-ui/core': 1.6.0 '@floating-ui/utils': 0.2.1 dev: false - /@floating-ui/react-dom@2.0.7(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-B5GJxKUyPcGsvE1vua+Abvw0t6zVMyTbtG+Jk7BoI4hfc5Ahv50dstRIAn0nS0274kR9gnKwxIXyGA8EzBZJrA==} + /@floating-ui/react-dom@2.0.8(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.6.0 + '@floating-ui/dom': 1.6.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false @@ -960,8 +960,8 @@ packages: react: 18.2.0 dev: false - /@mui/base@5.0.0-beta.33(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-WcSpoJUw/UYHXpvgtl4HyMar2Ar97illUpqiS/X1gtSBp6sdDW6kB2BJ9OlVQ+Kk/RL2GDp/WHA9sbjAYV35ow==} + /@mui/base@5.0.0-beta.34(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-e2mbTGTtReD/y5RFwnhkl1Tgl3XwgJhY040IlfkTVaU9f5LWrVhEnpRsYXu3B1CtLrwiWs4cu7aMHV9yRd4jpw==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -972,23 +972,23 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@floating-ui/react-dom': 2.0.7(react-dom@18.2.0)(react@18.2.0) - '@mui/types': 7.2.13(@types/react@18.2.48) - '@mui/utils': 5.15.6(@types/react@18.2.48)(react@18.2.0) + '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) + '@mui/types': 7.2.13(@types/react@18.2.52) + '@mui/utils': 5.15.7(@types/react@18.2.52)(react@18.2.0) '@popperjs/core': 2.11.8 - '@types/react': 18.2.48 + '@types/react': 18.2.52 clsx: 2.1.0 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@mui/core-downloads-tracker@5.15.6: - resolution: {integrity: sha512-0aoWS4qvk1uzm9JBs83oQmIMIQeTBUeqqu8u+3uo2tMznrB5fIKqQVCbCgq+4Tm4jG+5F7dIvnjvQ2aV7UKtdw==} + /@mui/core-downloads-tracker@5.15.7: + resolution: {integrity: sha512-AuF+Wo2Mp/edaO6vJnWjg+gj4tzEz5ChMZnAQpc22DXpSvM8ddgGcZvM7D7F99pIBoSv8ub+Iz0viL+yuGVmhg==} dev: false - /@mui/joy@5.0.0-beta.24(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-cKlIW56GsKKo9cVm+6pzNS+s4ch3r/SX/Zq5DA10I/TSuW9O5ptIOqeSs+WYpkyAzIoPkCpEXCPR/vGHpOt6MA==} + /@mui/joy@5.0.0-beta.25(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-7OF+np0h92GSVjwu1EyKRAjEsTJfP1F3RTIrtKH+XlzP/GYvZ68TiRen7sya0creQzGsc4NRJU3aEnvEX691Mg==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -1005,22 +1005,22 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@emotion/react': 11.11.3(@types/react@18.2.48)(react@18.2.0) - '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.48)(react@18.2.0) - '@mui/base': 5.0.0-beta.33(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0) - '@mui/core-downloads-tracker': 5.15.6 - '@mui/system': 5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.48)(react@18.2.0) - '@mui/types': 7.2.13(@types/react@18.2.48) - '@mui/utils': 5.15.6(@types/react@18.2.48)(react@18.2.0) - '@types/react': 18.2.48 + '@emotion/react': 11.11.3(@types/react@18.2.52)(react@18.2.0) + '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.52)(react@18.2.0) + '@mui/base': 5.0.0-beta.34(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0) + '@mui/core-downloads-tracker': 5.15.7 + '@mui/system': 5.15.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.52)(react@18.2.0) + '@mui/types': 7.2.13(@types/react@18.2.52) + '@mui/utils': 5.15.7(@types/react@18.2.52)(react@18.2.0) + '@types/react': 18.2.52 clsx: 2.1.0 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@mui/private-theming@5.15.6(@types/react@18.2.48)(react@18.2.0): - resolution: {integrity: sha512-ZBX9E6VNUSscUOtU8uU462VvpvBS7eFl5VfxAzTRVQBHflzL+5KtnGrebgf6Nd6cdvxa1o0OomiaxSKoN2XDmg==} + /@mui/private-theming@5.15.7(@types/react@18.2.52)(react@18.2.0): + resolution: {integrity: sha512-bcEeeXm7GyQCQvN9dwo8htGv8/6tP05p0i02Z7GXm5EoDPlBcqTNGugsjNLoGq6B0SsdyanjJGw0Jw00o1yAOA==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -1030,14 +1030,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@mui/utils': 5.15.6(@types/react@18.2.48)(react@18.2.0) - '@types/react': 18.2.48 + '@mui/utils': 5.15.7(@types/react@18.2.52)(react@18.2.0) + '@types/react': 18.2.52 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/styled-engine@5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0): - resolution: {integrity: sha512-KAn8P8xP/WigFKMlEYUpU9z2o7jJnv0BG28Qu1dhNQVutsLVIFdRf5Nb+0ijp2qgtcmygQ0FtfRuXv5LYetZTg==} + /@mui/styled-engine@5.15.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0): + resolution: {integrity: sha512-ixSdslOjK1kzdGcxqj7O3d14By/LPQ7EWknsViQ8RaeT863EAQemS+zvUJDTcOpkfJh6q6gPnYMIb2TJCs9eWA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -1051,15 +1051,15 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@emotion/cache': 11.11.0 - '@emotion/react': 11.11.3(@types/react@18.2.48)(react@18.2.0) - '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.48)(react@18.2.0) + '@emotion/react': 11.11.3(@types/react@18.2.52)(react@18.2.0) + '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.52)(react@18.2.0) csstype: 3.1.2 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/system@5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.48)(react@18.2.0): - resolution: {integrity: sha512-J01D//u8IfXvaEHMBQX5aO2l7Q+P15nt96c4NskX7yp5/+UuZP8XCQJhtBtLuj+M2LLyXHYGmCPeblsmmscP2Q==} + /@mui/system@5.15.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.52)(react@18.2.0): + resolution: {integrity: sha512-9alZ4/dLxsTwUOdqakgzxiL5YW6ntqj0CfzWImgWnBMTZhgGcPsbYpBLniNkkk7/jptma4/bykWXHwju/ls/pg==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -1075,20 +1075,20 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@emotion/react': 11.11.3(@types/react@18.2.48)(react@18.2.0) - '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.48)(react@18.2.0) - '@mui/private-theming': 5.15.6(@types/react@18.2.48)(react@18.2.0) - '@mui/styled-engine': 5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0) - '@mui/types': 7.2.13(@types/react@18.2.48) - '@mui/utils': 5.15.6(@types/react@18.2.48)(react@18.2.0) - '@types/react': 18.2.48 + '@emotion/react': 11.11.3(@types/react@18.2.52)(react@18.2.0) + '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.52)(react@18.2.0) + '@mui/private-theming': 5.15.7(@types/react@18.2.52)(react@18.2.0) + '@mui/styled-engine': 5.15.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0) + '@mui/types': 7.2.13(@types/react@18.2.52) + '@mui/utils': 5.15.7(@types/react@18.2.52)(react@18.2.0) + '@types/react': 18.2.52 clsx: 2.1.0 csstype: 3.1.2 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/types@7.2.13(@types/react@18.2.48): + /@mui/types@7.2.13(@types/react@18.2.52): resolution: {integrity: sha512-qP9OgacN62s+l8rdDhSFRe05HWtLLJ5TGclC9I1+tQngbssu0m2dmFZs+Px53AcOs9fD7TbYd4gc9AXzVqO/+g==} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -1096,11 +1096,11 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.48 + '@types/react': 18.2.52 dev: false - /@mui/utils@5.15.6(@types/react@18.2.48)(react@18.2.0): - resolution: {integrity: sha512-qfEhf+zfU9aQdbzo1qrSWlbPQhH1nCgeYgwhOVnj9Bn39shJQitEnXpSQpSNag8+uty5Od6PxmlNKPTnPySRKA==} + /@mui/utils@5.15.7(@types/react@18.2.52)(react@18.2.0): + resolution: {integrity: sha512-8qhsxQRNV6aEOjjSk6YQIYJxkF5klhj8oG1FEEU4z6HV78TjNqRxMP08QGcdsibEbez+nihAaz6vu83b4XqbAg==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -1111,7 +1111,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@types/prop-types': 15.7.11 - '@types/react': 18.2.48 + '@types/react': 18.2.52 prop-types: 15.8.1 react: 18.2.0 react-is: 18.2.0 @@ -1207,14 +1207,14 @@ packages: dependencies: immer: 9.0.21 react: 18.2.0 - react-redux: 8.1.3(@types/react-dom@18.2.18)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + react-redux: 8.1.3(@types/react-dom@18.2.18)(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) redux: 4.2.1 redux-thunk: 2.4.2(redux@4.2.1) reselect: 4.1.8 dev: false - /@remix-run/router@1.14.2: - resolution: {integrity: sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==} + /@remix-run/router@1.15.0: + resolution: {integrity: sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==} engines: {node: '>=14.0.0'} dev: false @@ -1322,7 +1322,7 @@ packages: dev: true optional: true - /@trivago/prettier-plugin-sort-imports@4.3.0(prettier@3.2.4): + /@trivago/prettier-plugin-sort-imports@4.3.0(prettier@3.2.5): resolution: {integrity: sha512-r3n0onD3BTOVUNPhR4lhVK4/pABGpbA7bW3eumZnYdKaHkf1qEC+Mag6DPbGNuuh0eG8AaYj+YqmVHSiGslaTQ==} peerDependencies: '@vue/compiler-sfc': 3.x @@ -1337,7 +1337,7 @@ packages: '@babel/types': 7.17.0 javascript-natural-sort: 0.7.1 lodash: 4.17.21 - prettier: 3.2.4 + prettier: 3.2.5 transitivePeerDependencies: - supports-color dev: true @@ -1378,7 +1378,7 @@ packages: /@types/hoist-non-react-statics@3.3.5: resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} dependencies: - '@types/react': 18.2.48 + '@types/react': 18.2.52 hoist-non-react-statics: 3.3.2 dev: false @@ -1404,8 +1404,8 @@ packages: resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==} dev: true - /@types/node@20.11.7: - resolution: {integrity: sha512-GPmeN1C3XAyV5uybAf4cMLWT9fDWcmQhZVtMFu7OR32WjrqGG+Wnk2V1d0bmtUyE/Zy1QJ9BxyiTih9z8Oks8A==} + /@types/node@20.11.16: + resolution: {integrity: sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==} dependencies: undici-types: 5.26.5 dev: true @@ -1424,10 +1424,10 @@ packages: /@types/react-dom@18.2.18: resolution: {integrity: sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==} dependencies: - '@types/react': 18.2.48 + '@types/react': 18.2.52 - /@types/react@18.2.48: - resolution: {integrity: sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==} + /@types/react@18.2.52: + resolution: {integrity: sha512-E/YjWh3tH+qsLKaUzgpZb5AY0ChVa+ZJzF7ogehVILrFpdQk6nC/WXOv0bfFEABbXbgNxLBGU7IIZByPKb6eBw==} dependencies: '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.8 @@ -1452,8 +1452,8 @@ packages: resolution: {integrity: sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==} dev: true - /@typescript-eslint/eslint-plugin@6.19.1(@typescript-eslint/parser@6.19.1)(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-roQScUGFruWod9CEyoV5KlCYrubC/fvG8/1zXuT0WTcxX87GnMMmnksMwSg99lo1xiKrBzw2icsJPMAw1OtKxg==} + /@typescript-eslint/eslint-plugin@6.20.0(@typescript-eslint/parser@6.20.0)(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha @@ -1464,15 +1464,15 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.19.1(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/scope-manager': 6.19.1 - '@typescript-eslint/type-utils': 6.19.1(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/utils': 6.19.1(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/visitor-keys': 6.19.1 + '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/scope-manager': 6.20.0 + '@typescript-eslint/type-utils': 6.20.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.20.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 6.20.0 debug: 4.3.4 eslint: 8.56.0 graphemer: 1.4.0 - ignore: 5.3.0 + ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.5.4 ts-api-utils: 1.0.3(typescript@5.3.3) @@ -1481,8 +1481,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@6.19.1(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-WEfX22ziAh6pRE9jnbkkLGp/4RhTpffr2ZK5bJ18M8mIfA8A+k97U9ZyaXCEJRlmMHh7R9MJZWXp/r73DzINVQ==} + /@typescript-eslint/parser@6.20.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -1491,10 +1491,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 6.19.1 - '@typescript-eslint/types': 6.19.1 - '@typescript-eslint/typescript-estree': 6.19.1(typescript@5.3.3) - '@typescript-eslint/visitor-keys': 6.19.1 + '@typescript-eslint/scope-manager': 6.20.0 + '@typescript-eslint/types': 6.20.0 + '@typescript-eslint/typescript-estree': 6.20.0(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 6.20.0 debug: 4.3.4 eslint: 8.56.0 typescript: 5.3.3 @@ -1502,16 +1502,16 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager@6.19.1: - resolution: {integrity: sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==} + /@typescript-eslint/scope-manager@6.20.0: + resolution: {integrity: sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.19.1 - '@typescript-eslint/visitor-keys': 6.19.1 + '@typescript-eslint/types': 6.20.0 + '@typescript-eslint/visitor-keys': 6.20.0 dev: true - /@typescript-eslint/type-utils@6.19.1(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-0vdyld3ecfxJuddDjACUvlAeYNrHP/pDeQk2pWBR2ESeEzQhg52DF53AbI9QCBkYE23lgkhLCZNkHn2hEXXYIg==} + /@typescript-eslint/type-utils@6.20.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -1520,8 +1520,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.19.1(typescript@5.3.3) - '@typescript-eslint/utils': 6.19.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 6.20.0(typescript@5.3.3) + '@typescript-eslint/utils': 6.20.0(eslint@8.56.0)(typescript@5.3.3) debug: 4.3.4 eslint: 8.56.0 ts-api-utils: 1.0.3(typescript@5.3.3) @@ -1530,13 +1530,13 @@ packages: - supports-color dev: true - /@typescript-eslint/types@6.19.1: - resolution: {integrity: sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==} + /@typescript-eslint/types@6.20.0: + resolution: {integrity: sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==} engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@6.19.1(typescript@5.3.3): - resolution: {integrity: sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==} + /@typescript-eslint/typescript-estree@6.20.0(typescript@5.3.3): + resolution: {integrity: sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' @@ -1544,8 +1544,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 6.19.1 - '@typescript-eslint/visitor-keys': 6.19.1 + '@typescript-eslint/types': 6.20.0 + '@typescript-eslint/visitor-keys': 6.20.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -1557,8 +1557,8 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@6.19.1(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-JvjfEZuP5WoMqwh9SPAPDSHSg9FBHHGhjPugSRxu5jMfjvBpq5/sGTD+9M9aQ5sh6iJ8AY/Kk/oUYVEMAPwi7w==} + /@typescript-eslint/utils@6.20.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -1566,9 +1566,9 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.6 - '@typescript-eslint/scope-manager': 6.19.1 - '@typescript-eslint/types': 6.19.1 - '@typescript-eslint/typescript-estree': 6.19.1(typescript@5.3.3) + '@typescript-eslint/scope-manager': 6.20.0 + '@typescript-eslint/types': 6.20.0 + '@typescript-eslint/typescript-estree': 6.20.0(typescript@5.3.3) eslint: 8.56.0 semver: 7.5.4 transitivePeerDependencies: @@ -1576,11 +1576,11 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys@6.19.1: - resolution: {integrity: sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==} + /@typescript-eslint/visitor-keys@6.20.0: + resolution: {integrity: sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.19.1 + '@typescript-eslint/types': 6.20.0 eslint-visitor-keys: 3.4.3 dev: true @@ -1599,7 +1599,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.9) '@types/babel__core': 7.20.5 react-refresh: 0.14.0 - vite: 5.0.12(@types/node@20.11.7)(less@4.2.0) + vite: 5.0.12(@types/node@20.11.16)(less@4.2.0) transitivePeerDependencies: - supports-color dev: true @@ -1681,11 +1681,12 @@ packages: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} dev: true - /array-buffer-byte-length@1.0.0: - resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} + /array-buffer-byte-length@1.0.1: + resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} + engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - is-array-buffer: 3.0.2 + is-array-buffer: 3.0.4 dev: true /array-includes@3.1.7: @@ -1695,7 +1696,7 @@ packages: call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 is-string: 1.0.7 dev: true @@ -1731,19 +1732,19 @@ packages: define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 dev: true /arraybuffer.prototype.slice@1.0.2: resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==} engines: {node: '>= 0.4'} dependencies: - array-buffer-byte-length: 1.0.0 + array-buffer-byte-length: 1.0.1 call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 - is-array-buffer: 3.0.2 + get-intrinsic: 1.2.3 + is-array-buffer: 3.0.4 is-shared-array-buffer: 1.0.2 dev: true @@ -1765,7 +1766,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.22.3 - caniuse-lite: 1.0.30001580 + caniuse-lite: 1.0.30001583 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -1773,8 +1774,8 @@ packages: postcss-value-parser: 4.2.0 dev: true - /available-typed-arrays@1.0.5: - resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} + /available-typed-arrays@1.0.6: + resolution: {integrity: sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==} engines: {node: '>= 0.4'} dev: true @@ -1828,8 +1829,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001580 - electron-to-chromium: 1.4.648 + caniuse-lite: 1.0.30001583 + electron-to-chromium: 1.4.656 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.3) dev: true @@ -1838,7 +1839,7 @@ packages: resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==} dependencies: function-bind: 1.1.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 set-function-length: 1.2.0 dev: true @@ -1851,8 +1852,8 @@ packages: engines: {node: '>= 6'} dev: false - /caniuse-lite@1.0.30001580: - resolution: {integrity: sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==} + /caniuse-lite@1.0.30001583: + resolution: {integrity: sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q==} dev: true /chalk@2.4.2: @@ -2015,7 +2016,7 @@ packages: resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 gopd: 1.0.1 has-property-descriptors: 1.0.1 dev: true @@ -2067,8 +2068,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: false - /electron-to-chromium@1.4.648: - resolution: {integrity: sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==} + /electron-to-chromium@1.4.656: + resolution: {integrity: sha512-9AQB5eFTHyR3Gvt2t/NwR0le2jBSUNwCnMbUCejFWHD+so4tH40/dRLgoE+jxlPeWS43XJewyvCv+I8LPMl49Q==} dev: true /emoji-regex@8.0.0: @@ -2104,14 +2105,14 @@ packages: resolution: {integrity: sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==} engines: {node: '>= 0.4'} dependencies: - array-buffer-byte-length: 1.0.0 + array-buffer-byte-length: 1.0.1 arraybuffer.prototype.slice: 1.0.2 - available-typed-arrays: 1.0.5 + available-typed-arrays: 1.0.6 call-bind: 1.0.5 es-set-tostringtag: 2.0.2 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 get-symbol-description: 1.0.0 globalthis: 1.0.3 gopd: 1.0.1 @@ -2120,13 +2121,13 @@ packages: has-symbols: 1.0.3 hasown: 2.0.0 internal-slot: 1.0.6 - is-array-buffer: 3.0.2 + is-array-buffer: 3.0.4 is-callable: 1.2.7 is-negative-zero: 2.0.2 is-regex: 1.1.4 is-shared-array-buffer: 1.0.2 is-string: 1.0.7 - is-typed-array: 1.1.12 + is-typed-array: 1.1.13 is-weakref: 1.0.2 object-inspect: 1.13.1 object-keys: 1.1.1 @@ -2142,7 +2143,12 @@ packages: typed-array-byte-offset: 1.0.0 typed-array-length: 1.0.4 unbox-primitive: 1.0.2 - which-typed-array: 1.1.13 + which-typed-array: 1.1.14 + dev: true + + /es-errors@1.0.0: + resolution: {integrity: sha512-yHV74THqMJUyFKkHyN7hyENcEZM3Dj2a2IrdClY+IT4BFQHkIVwlh8s6uZfjsFydMdNHv0F5mWgAA3ajFbsvVQ==} + engines: {node: '>= 0.4'} dev: true /es-iterator-helpers@1.0.15: @@ -2154,7 +2160,7 @@ packages: es-abstract: 1.22.3 es-set-tostringtag: 2.0.2 function-bind: 1.1.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 globalthis: 1.0.3 has-property-descriptors: 1.0.1 has-proto: 1.0.1 @@ -2168,8 +2174,8 @@ packages: resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.2 - has-tostringtag: 1.0.0 + get-intrinsic: 1.2.3 + has-tostringtag: 1.0.2 hasown: 2.0.0 dev: true @@ -2241,7 +2247,7 @@ packages: eslint: 8.56.0 dev: true - /eslint-plugin-prettier@5.1.3(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@3.2.4): + /eslint-plugin-prettier@5.1.3(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@3.2.5): resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2257,7 +2263,7 @@ packages: dependencies: eslint: 8.56.0 eslint-config-prettier: 8.10.0(eslint@8.56.0) - prettier: 3.2.4 + prettier: 3.2.5 prettier-linter-helpers: 1.0.0 synckit: 0.8.8 dev: true @@ -2330,7 +2336,7 @@ packages: glob-parent: 6.0.2 globals: 13.24.0 graphemer: 1.4.0 - ignore: 5.3.0 + ignore: 5.3.1 imurmurhash: 0.1.4 is-glob: 4.0.3 is-path-inside: 3.0.3 @@ -2530,9 +2536,11 @@ packages: engines: {node: '>=6.9.0'} dev: true - /get-intrinsic@1.2.2: - resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==} + /get-intrinsic@1.2.3: + resolution: {integrity: sha512-JIcZczvcMVE7AUOP+X72bh8HqHBRxFdz5PDHYtNG/lE3yk9b3KZBJlwFcTyPYjg3L4RLLmZJzvjxhaZVapxFrQ==} + engines: {node: '>= 0.4'} dependencies: + es-errors: 1.0.0 function-bind: 1.1.2 has-proto: 1.0.1 has-symbols: 1.0.3 @@ -2544,7 +2552,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 dev: true /glob-parent@5.1.2: @@ -2608,7 +2616,7 @@ packages: array-union: 2.1.0 dir-glob: 3.0.1 fast-glob: 3.3.2 - ignore: 5.3.0 + ignore: 5.3.1 merge2: 1.4.1 slash: 3.0.0 dev: true @@ -2624,7 +2632,7 @@ packages: /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 dev: true /graceful-fs@4.2.11: @@ -2653,7 +2661,7 @@ packages: /has-property-descriptors@1.0.1: resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 dev: true /has-proto@1.0.1: @@ -2666,8 +2674,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /has-tostringtag@1.0.0: - resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} + /has-tostringtag@1.0.2: + resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} dependencies: has-symbols: 1.0.3 @@ -2721,8 +2729,8 @@ packages: dev: true optional: true - /ignore@5.3.0: - resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==} + /ignore@5.3.1: + resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} engines: {node: '>= 4'} dev: true @@ -2772,17 +2780,17 @@ packages: resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 hasown: 2.0.0 side-channel: 1.0.4 dev: true - /is-array-buffer@3.0.2: - resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==} + /is-array-buffer@3.0.4: + resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} + engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 - is-typed-array: 1.1.12 + get-intrinsic: 1.2.3 dev: true /is-arrayish@0.2.1: @@ -2793,7 +2801,7 @@ packages: resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-bigint@1.0.4: @@ -2814,7 +2822,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-callable@1.2.7: @@ -2831,7 +2839,7 @@ packages: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-extglob@2.1.1: @@ -2853,7 +2861,7 @@ packages: resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-glob@4.0.3: @@ -2875,7 +2883,7 @@ packages: resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-number@7.0.0: @@ -2892,7 +2900,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-set@2.0.2: @@ -2909,7 +2917,7 @@ packages: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-symbol@1.0.4: @@ -2919,11 +2927,11 @@ packages: has-symbols: 1.0.3 dev: true - /is-typed-array@1.1.12: - resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==} + /is-typed-array@1.1.13: + resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} dependencies: - which-typed-array: 1.1.13 + which-typed-array: 1.1.14 dev: true /is-weakmap@2.0.1: @@ -2940,7 +2948,7 @@ packages: resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 dev: true /is-what@3.14.1: @@ -2966,7 +2974,7 @@ packages: resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==} dependencies: define-properties: 1.2.1 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 has-symbols: 1.0.3 reflect.getprototypeof: 1.0.4 set-function-name: 2.0.1 @@ -3545,8 +3553,8 @@ packages: fast-diff: 1.3.0 dev: true - /prettier@3.2.4: - resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} + /prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} engines: {node: '>=14'} hasBin: true dev: true @@ -3573,7 +3581,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 20.11.7 + '@types/node': 20.11.16 long: 5.2.3 dev: true @@ -3646,7 +3654,7 @@ packages: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: false - /react-redux@8.1.3(@types/react-dom@18.2.18)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1): + /react-redux@8.1.3(@types/react-dom@18.2.18)(@types/react@18.2.52)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1): resolution: {integrity: sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==} peerDependencies: '@types/react': ^16.8 || ^17.0 || ^18.0 @@ -3669,7 +3677,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 18.2.48 + '@types/react': 18.2.52 '@types/react-dom': 18.2.18 '@types/use-sync-external-store': 0.0.3 hoist-non-react-statics: 3.3.2 @@ -3685,26 +3693,26 @@ packages: engines: {node: '>=0.10.0'} dev: true - /react-router-dom@6.21.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==} + /react-router-dom@6.22.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-z2w+M4tH5wlcLmH3BMMOMdrtrJ9T3oJJNsAlBJbwk+8Syxd5WFJ7J5dxMEW0/GEXD1BBis4uXRrNIz3mORr0ag==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.14.2 + '@remix-run/router': 1.15.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.21.3(react@18.2.0) + react-router: 6.22.0(react@18.2.0) dev: false - /react-router@6.21.3(react@18.2.0): - resolution: {integrity: sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==} + /react-router@6.22.0(react@18.2.0): + resolution: {integrity: sha512-q2yemJeg6gw/YixRlRnVx6IRJWZD6fonnfZhN1JIOhV2iJCPeRNSH3V1ISwHf+JWcESzLC3BOLD1T07tmO5dmg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.14.2 + '@remix-run/router': 1.15.0 react: 18.2.0 dev: false @@ -3783,7 +3791,7 @@ packages: call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 globalthis: 1.0.3 which-builtin-type: 1.1.3 dev: true @@ -3881,7 +3889,7 @@ packages: engines: {node: '>=0.4'} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 has-symbols: 1.0.3 isarray: 2.0.5 dev: true @@ -3891,7 +3899,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 is-regex: 1.1.4 dev: true @@ -3944,7 +3952,7 @@ packages: dependencies: define-data-property: 1.1.1 function-bind: 1.1.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 gopd: 1.0.1 has-property-descriptors: 1.0.1 dev: true @@ -3977,7 +3985,7 @@ packages: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 object-inspect: 1.13.1 dev: true @@ -4057,7 +4065,7 @@ packages: call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.3 has-symbols: 1.0.3 internal-slot: 1.0.6 regexp.prototype.flags: 1.5.1 @@ -4267,8 +4275,8 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 - get-intrinsic: 1.2.2 - is-typed-array: 1.1.12 + get-intrinsic: 1.2.3 + is-typed-array: 1.1.13 dev: true /typed-array-byte-length@1.0.0: @@ -4278,18 +4286,18 @@ packages: call-bind: 1.0.5 for-each: 0.3.3 has-proto: 1.0.1 - is-typed-array: 1.1.12 + is-typed-array: 1.1.13 dev: true /typed-array-byte-offset@1.0.0: resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.5 + available-typed-arrays: 1.0.6 call-bind: 1.0.5 for-each: 0.3.3 has-proto: 1.0.1 - is-typed-array: 1.1.12 + is-typed-array: 1.1.13 dev: true /typed-array-length@1.0.4: @@ -4297,7 +4305,7 @@ packages: dependencies: call-bind: 1.0.5 for-each: 0.3.3 - is-typed-array: 1.1.12 + is-typed-array: 1.1.13 dev: true /typescript@5.3.3: @@ -4353,7 +4361,7 @@ packages: hasBin: true dev: false - /vite@5.0.12(@types/node@20.11.7)(less@4.2.0): + /vite@5.0.12(@types/node@20.11.16)(less@4.2.0): resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4381,7 +4389,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.7 + '@types/node': 20.11.16 esbuild: 0.19.12 less: 4.2.0 postcss: 8.4.33 @@ -4410,7 +4418,7 @@ packages: engines: {node: '>= 0.4'} dependencies: function.prototype.name: 1.1.6 - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 is-async-function: 2.0.0 is-date-object: 1.0.5 is-finalizationregistry: 1.0.2 @@ -4420,7 +4428,7 @@ packages: isarray: 2.0.5 which-boxed-primitive: 1.0.2 which-collection: 1.0.1 - which-typed-array: 1.1.13 + which-typed-array: 1.1.14 dev: true /which-collection@1.0.1: @@ -4432,15 +4440,15 @@ packages: is-weakset: 2.0.2 dev: true - /which-typed-array@1.1.13: - resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==} + /which-typed-array@1.1.14: + resolution: {integrity: sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.5 + available-typed-arrays: 1.0.6 call-bind: 1.0.5 for-each: 0.3.3 gopd: 1.0.1 - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /which@2.0.2: @@ -4508,7 +4516,7 @@ packages: engines: {node: '>=10'} dev: true - /zustand@4.5.0(@types/react@18.2.48)(react@18.2.0): + /zustand@4.5.0(@types/react@18.2.52)(react@18.2.0): resolution: {integrity: sha512-zlVFqS5TQ21nwijjhJlx4f9iGrXSL0o/+Dpy4txAP22miJ8Ti6c1Ol1RLNN98BMib83lmDH/2KmLwaNXpjrO1A==} engines: {node: '>=12.7.0'} peerDependencies: @@ -4523,7 +4531,7 @@ packages: react: optional: true dependencies: - '@types/react': 18.2.48 + '@types/react': 18.2.52 react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: false",chore,upgrade frontend dependencies 293f88e40c21d41ec0bde86729f91b8c5a35edec,2023-01-01 19:31:16,boojack,chore: update GitHub action name (#886),False,"diff --git a/.github/workflows/backend-tests-default.yml b/.github/workflows/backend-tests-default.yml index 79b3ca6bf34cf..02bc4f3b46260 100644 --- a/.github/workflows/backend-tests-default.yml +++ b/.github/workflows/backend-tests-default.yml @@ -1,10 +1,10 @@ -name: Backend Test +name: Default Backend Test on: pull_request: branches: - main - - ""release/v*.*.*"" + - ""release/*.*.*"" paths: - ""web/**"" diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index 01d9dc54c64f7..28beedc56543a 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - ""release/v*.*.*"" + - ""release/*.*.*"" paths-ignore: - ""web/**"" diff --git a/.github/workflows/frontend-tests-default.yml b/.github/workflows/frontend-tests-default.yml index 3aec38a1f2642..caee7572cb663 100644 --- a/.github/workflows/frontend-tests-default.yml +++ b/.github/workflows/frontend-tests-default.yml @@ -1,10 +1,10 @@ -name: Frontend Test +name: Default Frontend Test on: pull_request: branches: - main - - ""release/v*.*.*"" + - ""release/*.*.*"" paths-ignore: - ""web/**"" diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 65b5ec295714e..e0ac5f957187d 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - ""release/v*.*.*"" + - ""release/*.*.*"" paths: - ""web/**""",chore,update GitHub action name (#886) 3472a6db2675199fc51d618c713d1373dbba395b,2022-11-27 19:23:10,Jasper Platenburg,fix: password field visible (#609),False,"diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsx index dd79de06d94c5..47e53071fba38 100644 --- a/web/src/components/Settings/MemberSection.tsx +++ b/web/src/components/Settings/MemberSection.tsx @@ -117,7 +117,7 @@ const PreferencesSection = () => {
{t(""common.password"")} - +
",fix,password field visible (#609) d6680a0bcc77cd716787368cea0c16fc59a98a57,2022-05-19 19:59:27,STEVEN,feat: seed data only in dev mode (#61),False,"diff --git a/store/seed/10001__user.sql b/store/seed/10001__user.sql index dd23f6b6bf7d0..efd536753d6a9 100644 --- a/store/seed/10001__user.sql +++ b/store/seed/10001__user.sql @@ -1,17 +1,19 @@ INSERT INTO user ( `id`, - `name`, `email`, + `role`, + `name`, `open_id`, `password_hash` ) VALUES ( 101, - 'guest', - 'guest@example.com', - 'guest_open_id', + 'steven@memos.com', + 'OWNER', + 'Steven', + 'steven_open_id', -- raw password: secret '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK' ); diff --git a/store/sqlite.go b/store/sqlite.go index f04c126388583..81977df9c8547 100644 --- a/store/sqlite.go +++ b/store/sqlite.go @@ -54,8 +54,11 @@ func (db *DB) Open() (err error) { if err := db.migrate(); err != nil { return fmt.Errorf(""failed to migrate: %w"", err) } - if err := db.seed(); err != nil { - return fmt.Errorf(""failed to seed: %w"", err) + // If mode is dev, then seed the database. + if db.mode == ""dev"" { + if err := db.seed(); err != nil { + return fmt.Errorf(""failed to seed: %w"", err) + } } } else { // If db file exists and mode is dev, we should migrate and seed the database. diff --git a/web/src/less/signin.less b/web/src/less/signin.less index 2808cf563aef9..08ab0dc99a3c6 100644 --- a/web/src/less/signin.less +++ b/web/src/less/signin.less @@ -68,14 +68,6 @@ @apply cursor-wait opacity-80; } } - - > .btn-text { - @apply text-sm; - } - - > .split-text { - @apply text-gray-400 mx-2; - } } > .tip-text { diff --git a/web/src/pages/Signin.tsx b/web/src/pages/Signin.tsx index af777c81b5a89..8123c89aa4563 100644 --- a/web/src/pages/Signin.tsx +++ b/web/src/pages/Signin.tsx @@ -25,6 +25,10 @@ const Signin: React.FC = () => { useEffect(() => { api.getSystemStatus().then((status) => { setSiteOwner(status.owner); + if (status.profile.mode === ""dev"") { + setEmail(""steven@memos.com""); + setPassword(""secret""); + } pageLoadingState.setFinish(); }); }, []); @@ -105,28 +109,6 @@ const Signin: React.FC = () => { actionBtnLoadingState.setFinish(); }; - const handleAutoSigninAsGuestBtnClick = async () => { - if (actionBtnLoadingState.isLoading) { - return; - } - - try { - actionBtnLoadingState.setLoading(); - await api.login(""guest@example.com"", ""secret""); - - const user = await userService.doSignIn(); - if (user) { - locationService.replaceHistory(""/""); - } else { - toastHelper.error(""😟 Login failed""); - } - } catch (error: any) { - console.error(error); - toastHelper.error(""😟 "" + error.message); - } - actionBtnLoadingState.setFinish(); - }; - return (
@@ -149,10 +131,6 @@ const Signin: React.FC = () => {
- - / {siteOwner ? ( @@ -151,7 +152,7 @@ const Auth = () => {

{siteHost || pageLoadingState.isLoading ? t(""auth.not-host-tip"") : t(""auth.host-tip"")}

-
+
handleLocaleItemClick(""en"")}>",chore,support html form (#236) e7aeca736b865a5e4c939235865d843f5fee98c6,2023-10-05 15:06:00,boojack,chore: update i18n with weblate (#2332),False,"diff --git a/web/src/locales/de.json b/web/src/locales/de.json index 7409a6171a23b..2c67f77682fc5 100644 --- a/web/src/locales/de.json +++ b/web/src/locales/de.json @@ -1,411 +1,360 @@ { - ""common"": { - ""memos-slogan"": ""Ein schlankes, selbstgehostetes Memo-Hub. Open Source und für immer kostenlos."", - ""about"": ""Über Memos"", - ""home"": ""Startseite"", - ""resources"": ""Ressourcen"", - ""setting"": ""Einstellung"", - ""archived"": ""Archiviert"", - ""email"": ""E-Mail"", - ""password"": ""Passwort"", - ""avatar"": ""Avatar"", - ""username"": ""Nutzername"", - ""nickname"": ""Nickname"", - ""save"": ""Speichern"", - ""close"": ""Schließen"", - ""cancel"": ""Abbrechen"", - ""create"": ""Erstellen"", - ""update"": ""Update"", - ""change"": ""Ändern"", - ""confirm"": ""Bestätigen"", - ""reset"": ""Zurücksetzen"", - ""language"": ""Sprache"", - ""version"": ""Version"", - ""pin"": ""Anpinnen"", - ""unpin"": ""Pin lösen"", - ""edit"": ""Bearbeiten"", - ""restore"": ""Wiederherstellen"", - ""delete"": ""Löschen"", - ""null"": ""Null"", - ""share"": ""Teilen"", - ""archive"": ""Archivieren"", - ""basic"": ""Allgemeines"", - ""admin"": ""Administration"", - ""explore"": ""Erkunden"", - ""sign-in"": ""Anmelden"", - ""sign-in-with"": ""Anmelden mit {{provider}}"", - ""or"": ""oder"", - ""sign-up"": ""Registrieren"", - ""sign-out"": ""Abmelden"", - ""type"": ""Typ"", - ""title"": ""Titel"", - ""filter"": ""Filter"", - ""filter-period"": ""{{from}} bis {{to}}"", - ""tags"": ""Tags"", - ""yourself"": ""Du selbst"", - ""changed"": ""Verändert"", - ""fold"": ""Einklappen"", - ""expand"": ""Erweitern"", - ""image"": ""Bild"", - ""link"": ""Link"", - ""vacuum"": ""Aufräumen"", - ""select"": ""Auswählen"", - ""database"": ""Datenbank"", - ""upload"": ""Hochladen"", - ""preview"": ""Vorschau"", - ""rename"": ""Umbenennen"", - ""clear"": ""Leeren"", - ""name"": ""Name"", - ""visibility"": ""Sichtbarkeit"", - ""learn-more"": ""Mehr erfahren"", - ""beta"": ""Beta"", - ""new"": ""Neu"", - ""dialog"": { - ""error"": ""Fehler"", - ""help"": ""Hilfe"", - ""info"": ""Information"", - ""success"": ""Erfolgreich"", - ""warning"": ""Warnung"" + ""common"": { + ""about"": ""Über Memos"", + ""home"": ""Startseite"", + ""resources"": ""Ressourcen"", + ""archived"": ""Archiviert"", + ""email"": ""E-Mail"", + ""password"": ""Passwort"", + ""avatar"": ""Avatar"", + ""username"": ""Nutzername"", + ""nickname"": ""Nickname"", + ""save"": ""Speichern"", + ""close"": ""Schließen"", + ""cancel"": ""Abbrechen"", + ""create"": ""Erstellen"", + ""update"": ""Update"", + ""change"": ""Ändern"", + ""confirm"": ""Bestätigen"", + ""reset"": ""Zurücksetzen"", + ""language"": ""Sprache"", + ""version"": ""Version"", + ""pin"": ""Anpinnen"", + ""unpin"": ""Pin lösen"", + ""edit"": ""Bearbeiten"", + ""restore"": ""Wiederherstellen"", + ""delete"": ""Löschen"", + ""null"": ""Null"", + ""share"": ""Teilen"", + ""archive"": ""Archivieren"", + ""basic"": ""Allgemeines"", + ""admin"": ""Administration"", + ""explore"": ""Erkunden"", + ""sign-in"": ""Anmelden"", + ""sign-in-with"": ""Anmelden mit {{provider}}"", + ""or"": ""oder"", + ""sign-up"": ""Registrieren"", + ""sign-out"": ""Abmelden"", + ""type"": ""Typ"", + ""title"": ""Titel"", + ""filter"": ""Filter"", + ""filter-period"": ""{{from}} bis {{to}}"", + ""tags"": ""Tags"", + ""yourself"": ""Du selbst"", + ""changed"": ""Verändert"", + ""fold"": ""Einklappen"", + ""expand"": ""Erweitern"", + ""image"": ""Bild"", + ""link"": ""Link"", + ""vacuum"": ""Aufräumen"", + ""select"": ""Auswählen"", + ""database"": ""Datenbank"", + ""upload"": ""Hochladen"", + ""preview"": ""Vorschau"", + ""rename"": ""Umbenennen"", + ""clear"": ""Leeren"", + ""name"": ""Name"", + ""visibility"": ""Sichtbarkeit"", + ""learn-more"": ""Mehr erfahren"", + ""beta"": ""Beta"", + ""new"": ""Neu"", + ""mark"": ""Mark"" }, - ""mark"": ""Mark"" - }, - ""router"": { - ""go-to-home"": ""Zurück zur Startseite"" - }, - ""auth"": { - ""signup-as-host"": ""Als Host registrieren"", - ""host-tip"": ""Du registrierst dich als Host dieser Seite."", - ""not-host-tip"": ""Kontaktiere den Host dieser Seite, wenn du noch kein Konto hast."", - ""new-password"": ""Neues Passwort"", - ""repeat-new-password"": ""Neues Passwort wiederholen"" - }, - ""editor"": { - ""editing"": ""in Bearbeitung..."", - ""cancel-edit"": ""Bearbeiten abbrechen"", - ""save"": ""Speichern"", - ""placeholder"": ""Ein Gedanke..."", - ""only-image-supported"": ""Nur Bilder werden unterstützt."", - ""cant-empty"": ""Inhalt kann nicht leer sein"", - ""local"": ""Lokal"", - ""resources"": ""Ressourcen"" - }, - ""memo"": { - ""view-detail"": ""Details anzeigen"", - ""copy-link"": ""Link kopieren"", - ""embed"": ""Einbinden"", - ""archived-memos"": ""Archivierte Memos"", - ""no-archived-memos"": ""Keine archivierten Memos"", - ""fetching-data"": ""Lade Daten..."", - ""fetch-more"": ""Klicke hier, um mehr zu laden"", - ""archived-at"": ""Archiviert am"", - ""search-placeholder"": ""Suche memos"", - ""visibility"": { - ""private"": ""Nur für dich sichtbar"", - ""protected"": ""Für Mitglieder sichtbar"", - ""public"": ""Für alle sichtbar"", - ""disabled"": ""Öffentliche memos sind deaktiviert"" + ""router"": { + ""go-to-home"": ""Zurück zur Startseite"" }, - ""delete-memo"": ""Memo löschen"", - ""delete-confirm"": ""Bist du sicher, dass du diese Notiz löschen möchtest?\n\nDiese Aktion ist nicht rückgängig zu machen❗"" - }, - ""resource"": { - ""no-resources"": ""Keine Ressourcen."", - ""fetching-data"": ""Lade Daten..."", - ""copy-link"": ""Link kopieren"", - ""reset-link"": ""Link zurücksetzen"", - ""reset-resource-link"": ""Ressourcen-Link zurücksetzen"", - ""reset-link-prompt"": ""Bist du sicher, dass du diesen Link zurücksetzen möchtest?\nDadurch werden alle aktuellen Linkverwendungen ungültig.\n\nDiese Aktion ist nicht rückgängig zu machen❗"", - ""delete-resource"": ""Ressource löschen"", - ""linked-amount"": ""Anzahl verlinkter Memos"", - ""warning-text"": ""Möchtest du diese Ressource wirklich löschen? Dies kann nicht rückgängig gemacht werden❗"", - ""warning-text-unused"": ""Möchtest du diese ungenutzte Ressource wirklich löschen? Dies kann nicht rückgängig gemacht werden❗"", - ""no-unused-resources"": ""Keine ungenutzten Ressourcen"", - ""delete-selected-resources"": ""Ausgewählte Ressource löschen"", - ""no-files-selected"": ""Keine Dateien ausgewählt❗"", - ""upload-successfully"": ""Upload erfolgreich"", - ""file-drag-drop-prompt"": ""Ziehe deine Datei per Drag & Drop hierher, um sie hochzuladen"", - ""search-bar-placeholder"": ""Ressource suchen"", - ""clear"": ""Löschen"", - ""create-dialog"": { - ""title"": ""Ressource erstellen"", - ""upload-method"": ""Upload Methode"", - ""local-file"": { - ""option"": ""Lokale Datei"", - ""choose"": ""Wähle eine Datei..."" - }, - ""external-link"": { - ""option"": ""Externer Link"", - ""link"": ""Link"", - ""link-placeholder"": ""https://der.link.zu/deiner/ressource"", - ""file-name"": ""Dateiname"", - ""file-name-placeholder"": ""Dateiname"", - ""type"": ""Typ"", - ""type-placeholder"": ""Dateityp"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""Erstelle einen Tag mit `#tag`"", - ""create-tag"": ""Tag erstellen"", - ""all-tags"": ""Alle Tags"", - ""tag-name"": ""TAG_NAME"" - }, - ""daily-review"": { - ""title"": ""Tagesbilanz"", - ""no-memos"": ""Hoppla, da ist ja gar nichts."" - }, - ""setting"": { - ""my-account"": ""Mein Konto"", - ""preference"": ""Einstellungen"", - ""member"": ""Mitglieder"", - ""member-list"": ""Mitgliederliste"", - ""system"": ""System"", - ""openai"": ""OpenAI"", - ""storage"": ""Speicher"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""Konto-Informationen"", - ""username-note"": ""Zum Anmelden verwendet"", - ""nickname-note"": ""Wird im Banner angezeigt"", - ""email-note"": ""Optional"", - ""update-information"": ""Informationen ändern"", - ""change-password"": ""Passwort ändern"", - ""reset-api"": ""API zurücksetzen"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""OpenAPI Key zurücksetzen"", - ""openapi-reset-warning"": ""❗ Die bestehende API wird ungültig und eine neue wird erstellt.\n\nBist du sicher, dass du zurücksetzen möchtest?"", - ""openapi-sample-post"": ""Hallo #memos von {{url}}"" + ""auth"": { + ""host-tip"": ""Du registrierst dich als Host dieser Seite."", + ""new-password"": ""Neues Passwort"", + ""repeat-new-password"": ""Neues Passwort wiederholen"" }, - ""preference-section"": { - ""theme"": ""Design"", - ""default-memo-visibility"": ""Standard Sichtbarkeit von Memos"", - ""default-resource-visibility"": ""Standard Sichbarkeit von Ressourcen"", - ""enable-folding-memo"": ""Einklappen von Memos aktivieren"", - ""enable-double-click"": ""Doppelklick zum Bearbeiten aktivieren"", - ""editor-font-style"": ""Textstil des Editors"", - ""mobile-editor-style"": ""Stil des mobilen Editors"", - ""default-memo-sort-option"": ""Angezeigter Memo-Zeitpunkt"", - ""telegram-user-id"": ""Telegram UserID"", - ""telegram-user-id-placeholder"": ""Sende beliebige Wörter als Memo an deinen Telegram Bot"", - ""created_ts"": ""Erstellungszeitpunkt"", - ""updated_ts"": ""Änderungszeitpunkt"", - ""daily-review-time-offset"": ""Tägliche Überprüfung Zeitverschiebung"", - ""auto-collapse"": ""Automatisch reduzieren"" + ""editor"": { + ""editing"": ""in Bearbeitung..."", + ""cancel-edit"": ""Bearbeiten abbrechen"", + ""save"": ""Speichern"", + ""placeholder"": ""Ein Gedanke..."", + ""only-image-supported"": ""Nur Bilder werden unterstützt."", + ""cant-empty"": ""Inhalt kann nicht leer sein"", + ""local"": ""Lokal"", + ""resources"": ""Ressourcen"" }, - ""storage-section"": { - ""current-storage"": ""Aktueller Speicherdienst"", - ""type-database"": ""Datenbank"", - ""type-local"": ""Lokal"", - ""storage-services-list"": ""Liste der Speicherdienste"", - ""create-a-service"": ""Erstelle einen Dienst"", - ""update-a-service"": ""Aktualisiere einen Dienst"", - ""warning-text"": ""Bist du sicher, dass du den Speicherdienst \""{{name}}\"" löschen möchtest?\n\nDIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN❗"", - ""delete-storage"": ""Speicher löschen"", - ""local-storage-path"": ""Lokaler Speicherpfad"", - ""update-local-path"": ""Lokalen Speicherpfad aktualisieren"", - ""update-local-path-description"": ""Der lokale Speicherpfad ist ein relativer Pfad zu deiner Datenbankdatei"", - ""create-storage"": ""Speicher erstellen"", - ""update-storage"": ""Speicher aktualisieren"", - ""endpoint"": ""Endpoint"", - ""s3-compatible-url"": ""S3 kompatible URL"", - ""region"": ""Region"", - ""region-placeholder"": ""Name der Region"", - ""accesskey"": ""Zugangsschlüssel"", - ""accesskey-placeholder"": ""Zugangsschlüssel / Zugangs-ID"", - ""secretkey"": ""Geheimer Schlüssel"", - ""secretkey-placeholder"": ""Geheimer Schlüssel / Zugangsschlüssel"", - ""bucket"": ""Behälter"", - ""bucket-placeholder"": ""Name des Behälters"", - ""path"": ""Speicherpfad"", - ""path-description"": ""Du kannst dieselben dynamischen Variablen aus dem lokalen Speicher verwenden, wie {filename}"", - ""path-placeholder"": ""dein/pfad"", - ""url-prefix"": ""URL Präfix"", - ""url-prefix-placeholder"": ""Benutzerdefiniertes URL Präfix (optional)"", - ""url-suffix"": ""URL Suffix"", - ""url-suffix-placeholder"": ""Benutzerdefiniertes URL Suffix (optional)"" + ""memo"": { + ""view-detail"": ""Details anzeigen"", + ""copy-link"": ""Link kopieren"", + ""embed"": ""Einbinden"", + ""archived-memos"": ""Archivierte Memos"", + ""no-archived-memos"": ""Keine archivierten Memos"", + ""fetching-data"": ""Lade Daten..."", + ""fetch-more"": ""Klicke hier, um mehr zu laden"", + ""archived-at"": ""Archiviert am"", + ""search-placeholder"": ""Suche memos"", + ""visibility"": { + ""private"": ""Nur für dich sichtbar"", + ""protected"": ""Für Mitglieder sichtbar"", + ""public"": ""Für alle sichtbar"", + ""disabled"": ""Öffentliche memos sind deaktiviert"" + }, + ""delete-memo"": ""Memo löschen"", + ""delete-confirm"": ""Bist du sicher, dass du diese Notiz löschen möchtest?\n\nDiese Aktion ist nicht rückgängig zu machen❗"" }, - ""member-section"": { - ""create-a-member"": ""Mitglied hinzufügen"", - ""archive-member"": ""Mitglied archivieren"", - ""archive-warning"": ""❗ Bist du sicher, dass du {{username}} archivieren möchtest?"", - ""delete-member"": ""Mitglied löschen"", - ""delete-warning"": ""❗ Bist du sicher, dass du {{username}} löschen möchtest?\n\nDIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN❗"" + ""resource"": { + ""no-resources"": ""Keine Ressourcen."", + ""fetching-data"": ""Lade Daten..."", + ""copy-link"": ""Link kopieren"", + ""reset-link"": ""Link zurücksetzen"", + ""reset-resource-link"": ""Ressourcen-Link zurücksetzen"", + ""reset-link-prompt"": ""Bist du sicher, dass du diesen Link zurücksetzen möchtest?\nDadurch werden alle aktuellen Linkverwendungen ungültig.\n\nDiese Aktion ist nicht rückgängig zu machen❗"", + ""delete-resource"": ""Ressource löschen"", + ""linked-amount"": ""Anzahl verlinkter Memos"", + ""warning-text"": ""Möchtest du diese Ressource wirklich löschen? Dies kann nicht rückgängig gemacht werden❗"", + ""warning-text-unused"": ""Möchtest du diese ungenutzte Ressource wirklich löschen? Dies kann nicht rückgängig gemacht werden❗"", + ""no-unused-resources"": ""Keine ungenutzten Ressourcen"", + ""delete-selected-resources"": ""Ausgewählte Ressource löschen"", + ""no-files-selected"": ""Keine Dateien ausgewählt❗"", + ""upload-successfully"": ""Upload erfolgreich"", + ""file-drag-drop-prompt"": ""Ziehe deine Datei per Drag & Drop hierher, um sie hochzuladen"", + ""search-bar-placeholder"": ""Ressource suchen"", + ""clear"": ""Löschen"", + ""create-dialog"": { + ""title"": ""Ressource erstellen"", + ""upload-method"": ""Upload Methode"", + ""local-file"": { + ""option"": ""Lokale Datei"", + ""choose"": ""Wähle eine Datei..."" + }, + ""external-link"": { + ""option"": ""Externer Link"", + ""link"": ""Link"", + ""link-placeholder"": ""https://der.link.zu/deiner/ressource"", + ""file-name"": ""Dateiname"", + ""file-name-placeholder"": ""Dateiname"", + ""type"": ""Typ"", + ""type-placeholder"": ""Dateityp"" + } + } }, - ""system-section"": { - ""server-name"": ""Servername"", - ""customize-server"": { - ""title"": ""Server bearbeiten"", - ""default"": ""Standard: memos"", - ""icon-url"": ""Icon-URL"", - ""description"": ""Beschreibung"", - ""locale"": ""Sprache"", - ""appearance"": ""Erscheinungsbild"" - }, - ""database-file-size"": ""Dateigröße der Datenbank"", - ""allow-user-signup"": ""Erlaube Registrierung neuer Mitglieder"", - ""disable-password-login"": ""Anmeldung mit Passwort deaktivieren"", - ""disable-password-login-warning"": ""Dadurch wird die Passwortanmeldung für alle Benutzer deaktiviert. Es ist nicht möglich sich anzumelden, ohne diese Einstellung in der Datenbank rückgängig zu machen, wenn deine konfigurierten Provider ausfallen. Du musst auch besonders vorsichtig sein, wenn du einen Identitätsanbieter entfernst❗"", - ""disable-password-login-final-warning"": ""Bitte gebe \""CONFIRM\"" ein, wenn du weißt, was du tust."", - ""enable-password-login"": ""Anmeldung mit Passwort aktivieren"", - ""enable-password-login-warning"": ""Dadurch wird die Passwortanmeldung für alle Benutzer aktiviert. Fahre nur fort, wenn du möchtest, dass sich Benutzer sowohl mit SSO als auch mit einem Passwort anmelden können❗"", - ""ignore-version-upgrade"": ""Versions-Upgrade ignorieren"", - ""disable-public-memos"": ""Öffentliche memos deaktivieren"", - ""max-upload-size"": ""Maximale Uploadgröße (MiB)"", - ""max-upload-size-hint"": ""Empfohlene Wert ist 32 MiB."", - ""auto-backup-interval"": ""Intervall für automatische Sicherung (Sekunden)"", - ""auto-backup-interval-hint"": ""Setze den Wert auf 0, um die automatische Sicherung zu deaktivieren. Nach Änderung dieses Wertes ist ein Neustart erforderlich."", - ""additional-style"": ""Zusätzlicher Stil"", - ""additional-script"": ""Zusätzliches Skript"", - ""additional-style-placeholder"": ""Zusätzliches CSS"", - ""additional-script-placeholder"": ""Zusätzliches JavaScript"", - ""telegram-bot-token"": ""Telegram Bot Token"", - ""telegram-bot-token-description"": ""Telegram Bot Token oder API Proxy, wie `http.../bot`"", - ""telegram-bot-token-placeholder"": ""Dein Telegram Bot token"", - ""openai-api-key"": ""OpenAI: API Schlüssel"", - ""openai-api-key-description"": ""API-Schlüssel abrufen"", - ""openai-api-key-placeholder"": ""Dein OpenAI API-Schlüssel"", - ""openai-api-host"": ""OpenAI: API Host"", - ""openai-api-host-placeholder"": ""Standard: https://api.openai.com/"", - ""display-with-updated-time"": ""Anzeige mit aktualisierter Zeit"" + ""tag-list"": { + ""tip-text"": ""Erstelle einen Tag mit `#tag`"", + ""create-tag"": ""Tag erstellen"", + ""all-tags"": ""Alle Tags"", + ""tag-name"": ""TAG_NAME"" }, - ""appearance-option"": { - ""system"": ""System"", - ""light"": ""Hell"", - ""dark"": ""Dunkel"" + ""daily-review"": { + ""title"": ""Tagesbilanz"", + ""no-memos"": ""Hoppla, da ist ja gar nichts."" }, - ""sso-section"": { - ""sso-list"": ""SSO Liste"", - ""delete-sso"": ""Löschen bestätigen"", - ""confirm-delete"": ""Bist du sicher, dass du die SSO-Konfiguration von \""{{name}}\"" löschen möchtest?\n\nDIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN❗"", - ""create-sso"": ""SSO erstellen"", - ""update-sso"": ""SSO aktualisieren"", - ""sso-created"": ""SSO {{name}} erstellt"", - ""sso-updated"": ""SSO {{name}} aktualisiert"", - ""identifier"": ""Kennzeichnung"", - ""display-name"": ""Anzeigename"", - ""template"": ""Vorlage"", - ""custom"": ""Benutzerdefiniert"", - ""identifier-filter"": ""Kennzeichnungsfilter"", - ""redirect-url"": ""URL-Weiterleitung"", - ""client-id"": ""Client ID"", - ""client-secret"": ""Client secret"", - ""authorization-endpoint"": ""Autorisierungsendpunkt"", - ""token-endpoint"": ""Tokenendpunkt"", - ""user-endpoint"": ""Benutzerendpunkt"", - ""scopes"": ""Geltungsbereiche"", - ""disabled-password-login-warning"": ""Passwort-Login ist deaktiviert, sei besonders vorsichtig beim Entfernen von Identitätsanbieter❗"" - } - }, - ""filter"": { - ""new-filter"": ""Neuer Filter"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Typ"", - ""text"": ""Text"", - ""display-time"": ""angezeigte Zeit"", - ""visibility"": ""Sichtbarkeit"" + ""setting"": { + ""my-account"": ""Mein Konto"", + ""preference"": ""Einstellungen"", + ""member"": ""Mitglieder"", + ""member-list"": ""Mitgliederliste"", + ""system"": ""System"", + ""storage"": ""Speicher"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""Konto-Informationen"", + ""username-note"": ""Zum Anmelden verwendet"", + ""nickname-note"": ""Wird im Banner angezeigt"", + ""email-note"": ""Optional"", + ""update-information"": ""Informationen ändern"", + ""change-password"": ""Passwort ändern"", + ""reset-api"": ""API zurücksetzen"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""OpenAPI Key zurücksetzen"", + ""openapi-reset-warning"": ""❗ Die bestehende API wird ungültig und eine neue wird erstellt.\n\nBist du sicher, dass du zurücksetzen möchtest?"", + ""openapi-sample-post"": ""Hallo #memos von {{url}}"" + }, + ""preference-section"": { + ""theme"": ""Design"", + ""default-memo-visibility"": ""Standard Sichtbarkeit von Memos"", + ""default-resource-visibility"": ""Standard Sichbarkeit von Ressourcen"", + ""enable-folding-memo"": ""Einklappen von Memos aktivieren"", + ""enable-double-click"": ""Doppelklick zum Bearbeiten aktivieren"", + ""editor-font-style"": ""Textstil des Editors"", + ""mobile-editor-style"": ""Stil des mobilen Editors"", + ""default-memo-sort-option"": ""Angezeigter Memo-Zeitpunkt"", + ""telegram-user-id"": ""Telegram UserID"", + ""telegram-user-id-placeholder"": ""Sende beliebige Wörter als Memo an deinen Telegram Bot"", + ""created_ts"": ""Erstellungszeitpunkt"", + ""updated_ts"": ""Änderungszeitpunkt"", + ""daily-review-time-offset"": ""Tägliche Überprüfung Zeitverschiebung"", + ""auto-collapse"": ""Automatisch reduzieren"" + }, + ""storage-section"": { + ""current-storage"": ""Aktueller Speicherdienst"", + ""type-database"": ""Datenbank"", + ""type-local"": ""Lokal"", + ""storage-services-list"": ""Liste der Speicherdienste"", + ""create-a-service"": ""Erstelle einen Dienst"", + ""update-a-service"": ""Aktualisiere einen Dienst"", + ""warning-text"": ""Bist du sicher, dass du den Speicherdienst \""{{name}}\"" löschen möchtest?\n\nDIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN❗"", + ""delete-storage"": ""Speicher löschen"", + ""local-storage-path"": ""Lokaler Speicherpfad"", + ""update-local-path"": ""Lokalen Speicherpfad aktualisieren"", + ""update-local-path-description"": ""Der lokale Speicherpfad ist ein relativer Pfad zu deiner Datenbankdatei"", + ""create-storage"": ""Speicher erstellen"", + ""update-storage"": ""Speicher aktualisieren"", + ""endpoint"": ""Endpoint"", + ""s3-compatible-url"": ""S3 kompatible URL"", + ""region"": ""Region"", + ""region-placeholder"": ""Name der Region"", + ""accesskey"": ""Zugangsschlüssel"", + ""accesskey-placeholder"": ""Zugangsschlüssel / Zugangs-ID"", + ""secretkey"": ""Geheimer Schlüssel"", + ""secretkey-placeholder"": ""Geheimer Schlüssel / Zugangsschlüssel"", + ""bucket"": ""Behälter"", + ""bucket-placeholder"": ""Name des Behälters"", + ""path"": ""Speicherpfad"", + ""path-description"": ""Du kannst dieselben dynamischen Variablen aus dem lokalen Speicher verwenden, wie {filename}"", + ""path-placeholder"": ""dein/pfad"", + ""url-prefix"": ""URL Präfix"", + ""url-prefix-placeholder"": ""Benutzerdefiniertes URL Präfix (optional)"", + ""url-suffix"": ""URL Suffix"", + ""url-suffix-placeholder"": ""Benutzerdefiniertes URL Suffix (optional)"" + }, + ""member-section"": { + ""create-a-member"": ""Mitglied hinzufügen"", + ""archive-member"": ""Mitglied archivieren"", + ""archive-warning"": ""❗ Bist du sicher, dass du {{username}} archivieren möchtest?"", + ""delete-member"": ""Mitglied löschen"", + ""delete-warning"": ""❗ Bist du sicher, dass du {{username}} löschen möchtest?\n\nDIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN❗"" + }, + ""system-section"": { + ""server-name"": ""Servername"", + ""customize-server"": { + ""title"": ""Server bearbeiten"", + ""default"": ""Standard: memos"", + ""icon-url"": ""Icon-URL"", + ""description"": ""Beschreibung"", + ""locale"": ""Sprache"", + ""appearance"": ""Erscheinungsbild"" + }, + ""database-file-size"": ""Dateigröße der Datenbank"", + ""allow-user-signup"": ""Erlaube Registrierung neuer Mitglieder"", + ""disable-password-login"": ""Anmeldung mit Passwort deaktivieren"", + ""disable-password-login-warning"": ""Dadurch wird die Passwortanmeldung für alle Benutzer deaktiviert. Es ist nicht möglich sich anzumelden, ohne diese Einstellung in der Datenbank rückgängig zu machen, wenn deine konfigurierten Provider ausfallen. Du musst auch besonders vorsichtig sein, wenn du einen Identitätsanbieter entfernst❗"", + ""disable-password-login-final-warning"": ""Bitte gebe \""CONFIRM\"" ein, wenn du weißt, was du tust."", + ""enable-password-login"": ""Anmeldung mit Passwort aktivieren"", + ""enable-password-login-warning"": ""Dadurch wird die Passwortanmeldung für alle Benutzer aktiviert. Fahre nur fort, wenn du möchtest, dass sich Benutzer sowohl mit SSO als auch mit einem Passwort anmelden können❗"", + ""ignore-version-upgrade"": ""Versions-Upgrade ignorieren"", + ""disable-public-memos"": ""Öffentliche memos deaktivieren"", + ""max-upload-size"": ""Maximale Uploadgröße (MiB)"", + ""max-upload-size-hint"": ""Empfohlene Wert ist 32 MiB."", + ""auto-backup-interval"": ""Intervall für automatische Sicherung (Sekunden)"", + ""auto-backup-interval-hint"": ""Setze den Wert auf 0, um die automatische Sicherung zu deaktivieren. Nach Änderung dieses Wertes ist ein Neustart erforderlich."", + ""additional-style"": ""Zusätzlicher Stil"", + ""additional-script"": ""Zusätzliches Skript"", + ""additional-style-placeholder"": ""Zusätzliches CSS"", + ""additional-script-placeholder"": ""Zusätzliches JavaScript"", + ""telegram-bot-token"": ""Telegram Bot Token"", + ""telegram-bot-token-description"": ""Telegram Bot Token oder API Proxy, wie `http.../bot`"", + ""telegram-bot-token-placeholder"": ""Dein Telegram Bot token"", + ""display-with-updated-time"": ""Anzeige mit aktualisierter Zeit"" + }, + ""appearance-option"": { + ""system"": ""System"", + ""light"": ""Hell"", + ""dark"": ""Dunkel"" + }, + ""sso-section"": { + ""sso-list"": ""SSO Liste"", + ""delete-sso"": ""Löschen bestätigen"", + ""confirm-delete"": ""Bist du sicher, dass du die SSO-Konfiguration von \""{{name}}\"" löschen möchtest?\n\nDIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN❗"", + ""create-sso"": ""SSO erstellen"", + ""update-sso"": ""SSO aktualisieren"", + ""sso-created"": ""SSO {{name}} erstellt"", + ""sso-updated"": ""SSO {{name}} aktualisiert"", + ""identifier"": ""Kennzeichnung"", + ""display-name"": ""Anzeigename"", + ""template"": ""Vorlage"", + ""custom"": ""Benutzerdefiniert"", + ""identifier-filter"": ""Kennzeichnungsfilter"", + ""redirect-url"": ""URL-Weiterleitung"", + ""client-id"": ""Client ID"", + ""client-secret"": ""Client secret"", + ""authorization-endpoint"": ""Autorisierungsendpunkt"", + ""token-endpoint"": ""Tokenendpunkt"", + ""user-endpoint"": ""Benutzerendpunkt"", + ""scopes"": ""Geltungsbereiche"", + ""disabled-password-login-warning"": ""Passwort-Login ist deaktiviert, sei besonders vorsichtig beim Entfernen von Identitätsanbieter❗"" + } + }, + ""amount-text"": { + ""memo_one"": ""MEMO"", + ""memo_other"": ""MEMOS"" + }, + ""message"": { + ""no-data"": ""Vielleicht wurden keine Daten gefunden, vielleicht sollte es eine andere Option sein."", + ""memos-ready"": ""Alle Memos geladen 🎉"", + ""resource-ready"": ""Alle Ressourcen geladen 🎉"", + ""restored-successfully"": ""Erfolgreich wiederhergestellt"", + ""memo-updated-datetime"": ""Erstellungszeitpunkt geändert."", + ""invalid-created-datetime"": ""Ungültiger Erstellungszeitpunkt"", + ""change-memo-created-time"": ""Erstellungszeitpunkt ändern"", + ""change-memo-created-time-warning-1"": ""DIES IST KEIN NORMALES VERHALTEN."", + ""change-memo-created-time-warning-2"": ""Bitte vergewissere dich, dass du es wirklich brauchst."", + ""memo-not-found"": ""Memo nicht gefunden."", + ""fill-all"": ""Bitte alle Felder ausfüllen."", + ""password-not-match"": ""Passwörter stimmen nicht überein"", + ""new-password-not-match"": ""Neue Passwörter stimmen nicht überein."", + ""image-load-failed"": ""Laden des Bildes fehlgeschlagen"", + ""fill-form"": ""Bitte das Formular ausfüllen"", + ""fill-server-name"": ""Bitte Servernamen ausfüllen"", + ""login-failed"": ""Anmeldung fehlgeschlagen"", + ""signup-failed"": ""Registrierung fehlgeschlagen"", + ""user-not-found"": ""Nutzer nicht gefunden"", + ""password-changed"": ""Passwort geändert"", + ""private-only"": ""Dieses Memo ist privat."", + ""copied"": ""Kopiert"", + ""succeed-copy-content"": ""Inhalt erfolgreich kopiert"", + ""succeed-copy-code"": ""Code in die Zwischenablage kopieren."", + ""succeed-copy-link"": ""Link erfolgreich kopiert"", + ""change-resource-filename"": ""Dateinamen der Ressource ändern"", + ""resource-filename-updated"": ""Dateiname der Ressource geändert."", + ""invalid-resource-filename"": ""Ungültiger Dateiname."", + ""click-to-save-the-image"": ""Klicken um Bild zu speichern"", + ""generating-the-screenshot"": ""Erstelle Screenshot..."", + ""count-selected-resources"": ""Insgesamt markiert"", + ""succeed-vacuum-database"": ""Aufräumen der Datenbank erfolgreich"", + ""succeed-update-additional-style"": ""Zusätzlicher Stil wurde erfolgreich aktualisiert"", + ""succeed-copy-resource-link"": ""Link zur Ressource wurde erfolgreich kopiert"", + ""succeed-update-customized-profile"": ""Server-Einstlelungen wurden erfolgreich gespeichert"", + ""succeed-update-additional-script"": ""Zusätzliches Skript wurde erfolgreich aktualisiert"", + ""update-succeed"": ""Update erfolgreich"", + ""page-not-found"": ""404 - Seite nicht gefunden 😥"", + ""maximum-upload-size-is"": ""Die maximal zulässige Upload-Größe beträgt {{size}} MiB"", + ""file-exceeds-upload-limit-of"": ""Datei {{file}} überschreitet Upload-Limit von {{size}} MiB"", + ""updating-setting-failed"": ""Aktualisierung der Einstellung fehlgeschlagen"", + ""password-login-disabled"": ""Der letzte Identitätsanbieter kann nicht entfernt werden, solang die Passwortanmeldung deaktiviert ist"" }, - ""operator"": { - ""contains"": ""enthält"", - ""not-contains"": ""enthält nicht"", - ""is"": ""ist"", - ""is-not"": ""ist nicht"", - ""before"": ""vor"", - ""after"": ""nach"" + ""days"": { + ""mon"": ""Mo"", + ""tue"": ""Di"", + ""wed"": ""Mi"", + ""thu"": ""Do"", + ""fri"": ""Fr"", + ""sat"": ""Sa"", + ""sun"": ""So"" }, - ""value"": { - ""not-tagged"": ""Keine Tags"", - ""linked"": ""Hat Links"", - ""has-attachment"": ""Hat Anhänge"" + ""embed-memo"": { + ""title"": ""Memo einbetten"", + ""text"": ""Kopiere den unten stehenden Code und füge diesen in deinen Blog oder deine Website ein."", + ""only-public-supported"": ""* Nur öffentliche Notizen können eingebettet werden."", + ""copy"": ""Kopieren"" }, - ""text-placeholder"": ""Beginne einen Regex mit ^"", - ""and"": ""Und"", - ""or"": ""Oder"" - }, - ""amount-text"": { - ""memo_one"": ""MEMO"", - ""memo_other"": ""MEMOS"", - ""tag_one"": ""TAG"", - ""tag_other"": ""TAGS"", - ""day_one"": ""TAG"", - ""day_other"": ""TAGE"" - }, - ""message"": { - ""no-data"": ""Vielleicht wurden keine Daten gefunden, vielleicht sollte es eine andere Option sein."", - ""memos-ready"": ""Alle Memos geladen 🎉"", - ""resource-ready"": ""Alle Ressourcen geladen 🎉"", - ""restored-successfully"": ""Erfolgreich wiederhergestellt"", - ""memo-updated-datetime"": ""Erstellungszeitpunkt geändert."", - ""invalid-created-datetime"": ""Ungültiger Erstellungszeitpunkt"", - ""change-memo-created-time"": ""Erstellungszeitpunkt ändern"", - ""change-memo-created-time-warning-1"": ""DIES IST KEIN NORMALES VERHALTEN."", - ""change-memo-created-time-warning-2"": ""Bitte vergewissere dich, dass du es wirklich brauchst."", - ""memo-not-found"": ""Memo nicht gefunden."", - ""fill-all"": ""Bitte alle Felder ausfüllen."", - ""password-not-match"": ""Passwörter stimmen nicht überein"", - ""new-password-not-match"": ""Neue Passwörter stimmen nicht überein."", - ""image-load-failed"": ""Laden des Bildes fehlgeschlagen"", - ""fill-form"": ""Bitte das Formular ausfüllen"", - ""fill-server-name"": ""Bitte Servernamen ausfüllen"", - ""login-failed"": ""Anmeldung fehlgeschlagen"", - ""signup-failed"": ""Registrierung fehlgeschlagen"", - ""user-not-found"": ""Nutzer nicht gefunden"", - ""password-changed"": ""Passwort geändert"", - ""private-only"": ""Dieses Memo ist privat."", - ""copied"": ""Kopiert"", - ""succeed-copy-content"": ""Inhalt erfolgreich kopiert"", - ""succeed-copy-code"": ""Code in die Zwischenablage kopieren."", - ""succeed-copy-link"": ""Link erfolgreich kopiert"", - ""change-resource-filename"": ""Dateinamen der Ressource ändern"", - ""resource-filename-updated"": ""Dateiname der Ressource geändert."", - ""invalid-resource-filename"": ""Ungültiger Dateiname."", - ""click-to-save-the-image"": ""Klicken um Bild zu speichern"", - ""generating-the-screenshot"": ""Erstelle Screenshot..."", - ""count-selected-resources"": ""Insgesamt markiert"", - ""too-short"": ""Zu kurz"", - ""too-long"": ""Zu lang"", - ""not-allow-space"": ""Keine Leerzeichen erlaubt"", - ""not-allow-chinese"": ""Keine chinesischen Zeichen erlaubt"", - ""succeed-vacuum-database"": ""Aufräumen der Datenbank erfolgreich"", - ""succeed-update-additional-style"": ""Zusätzlicher Stil wurde erfolgreich aktualisiert"", - ""succeed-copy-resource-link"": ""Link zur Ressource wurde erfolgreich kopiert"", - ""succeed-update-customized-profile"": ""Server-Einstlelungen wurden erfolgreich gespeichert"", - ""succeed-update-additional-script"": ""Zusätzliches Skript wurde erfolgreich aktualisiert"", - ""update-succeed"": ""Update erfolgreich"", - ""page-not-found"": ""404 - Seite nicht gefunden 😥"", - ""maximum-upload-size-is"": ""Die maximal zulässige Upload-Größe beträgt {{size}} MiB"", - ""file-exceeds-upload-limit-of"": ""Datei {{file}} überschreitet Upload-Limit von {{size}} MiB"", - ""updating-setting-failed"": ""Aktualisierung der Einstellung fehlgeschlagen"", - ""password-login-disabled"": ""Der letzte Identitätsanbieter kann nicht entfernt werden, solang die Passwortanmeldung deaktiviert ist"" - }, - ""days"": { - ""mon"": ""Mo"", - ""tue"": ""Di"", - ""wed"": ""Mi"", - ""thu"": ""Do"", - ""fri"": ""Fr"", - ""sat"": ""Sa"", - ""sun"": ""So"" - }, - ""embed-memo"": { - ""title"": ""Memo einbetten"", - ""text"": ""Kopiere den unten stehenden Code und füge diesen in deinen Blog oder deine Website ein."", - ""only-public-supported"": ""* Nur öffentliche Notizen können eingebettet werden."", - ""copy"": ""Kopieren"" - }, - ""heatmap"": { - ""memo-in"": ""memo in {{period}}"", - ""memos-in"": ""memos in {{period}}"", - ""memo-on"": ""{{amount}} memo am {{date}}"", - ""memos-on"": ""{{amount}} memos am {{date}}"", - ""day"": ""Tag"", - ""days"": ""Tage"" - }, - ""about"": { - ""about-memos"": ""Über Memos"", - ""memos-description"": ""Memos ist eine webbasierte Anwendung zur Erstellung von Notizen, mit der Sie Notizen schreiben, organisieren und teilen können."", - ""no-server-description"": ""Für diesen Server ist keine Beschreibung konfiguriert."", - ""powered-by"": ""Powered by"", - ""other-projects"": ""Andere Projekte"" - } + ""heatmap"": { + ""memo-in"": ""memo in {{period}}"", + ""memos-in"": ""memos in {{period}}"", + ""memo-on"": ""{{amount}} memo am {{date}}"", + ""memos-on"": ""{{amount}} memos am {{date}}"", + ""day"": ""Tag"", + ""days"": ""Tage"" + }, + ""about"": { + ""about-memos"": ""Über Memos"", + ""memos-description"": ""Memos ist eine webbasierte Anwendung zur Erstellung von Notizen, mit der Sie Notizen schreiben, organisieren und teilen können."", + ""no-server-description"": ""Für diesen Server ist keine Beschreibung konfiguriert."", + ""powered-by"": ""Powered by"", + ""other-projects"": ""Andere Projekte"" + } } diff --git a/web/src/locales/es.json b/web/src/locales/es.json index 801b97611e9ff..2b7590bcec919 100644 --- a/web/src/locales/es.json +++ b/web/src/locales/es.json @@ -1,264 +1,190 @@ { - ""common"": { - ""about"": ""Acerca de"", - ""email"": ""Email"", - ""password"": ""Contraseña"", - ""repeat-password-short"": ""Repetir"", - ""repeat-password"": ""Repetir la contraseña"", - ""new-password"": ""Nueva contraseña"", - ""repeat-new-password"": ""Repetir la nueva contraseña"", - ""username"": ""Usuario"", - ""nickname"": ""Apodo"", - ""save"": ""Guardar"", - ""close"": ""Cerrar"", - ""cancel"": ""Cancelar"", - ""create"": ""Crear"", - ""change"": ""Cambiar"", - ""confirm"": ""Confirmar"", - ""reset"": ""Restablecer"", - ""language"": ""Idioma"", - ""version"": ""Versión"", - ""pin"": ""Enganchar"", - ""unpin"": ""Desenganchar"", - ""edit"": ""Editar"", - ""restore"": ""Restaurar"", - ""delete"": ""Eliminar"", - ""null"": ""Nulo"", - ""share"": ""Compartir"", - ""archive"": ""Archivar"", - ""basic"": ""Básico"", - ""admin"": ""Administrador"", - ""explore"": ""Explorar"", - ""sign-in"": ""Iniciar sesión"", - ""sign-up"": ""Registrarse"", - ""sign-out"": ""Cerrar sesión"", - ""back-to-home"": ""Volver al Inicio"", - ""type"": ""Tipo"", - ""title"": ""Título"", - ""filter"": ""Filtros"", - ""tags"": ""Etiquetas"", - ""yourself"": ""Tu"", - ""archived-at"": ""Archivado en"", - ""changed"": ""cambiado"", - ""update-on"": ""Actualización de"", - ""fold"": ""Plegar"", - ""expand"": ""Expandir"", - ""image"": ""Imagen"", - ""link"": ""Enlace"", - ""vacuum"": ""Vaciar"", - ""select"": ""Seleccionar"", - ""database"": ""Base de datos"", - ""avatar"": ""Avatar"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Registrarse como Anfitrión"", - ""host-tip"": ""Te estás registrando como Anfitrión del Sitio."", - ""not-host-tip"": ""Si no tienes una cuenta, ponte en contacto con el anfitrión del sitio."" - }, - ""sidebar"": { - ""daily-review"": ""Resumen diario"", - ""resources"": ""Recursos"", - ""setting"": ""Ajustes"", - ""archived"": ""Archivado"" - }, - ""resource"": { - ""description"": ""Visualiza tus recursos estáticos en notas. p.ej., imágenes"", - ""no-resources"": ""Sin recursos."", - ""fetching-data"": ""obteniendo datos..."", - ""upload"": ""Subir"", - ""preview"": ""Vista previa"", - ""copy-link"": ""Copiar Enlace"", - ""delete-resource"": ""Borrar Recurso"", - ""warning-text"": ""¿Está seguro de eliminar este recurso? ESTA ACCIÓN ES IRREVERSIBLE❗"", - ""linked-amount"": ""Importe de la nota vinculado"", - ""rename"": ""Renombrar"", - ""warning-text-unused"": ""¿Está seguro de eliminar estos recursos no utilizados? ESTA ACCIÓN ES IRREVERSIBLE❗"", - ""no-unused-resources"": ""No hay recursos sin utilizar"", - ""name"": ""Nombre"", - ""clear"": ""Limpiar"" - }, - ""archived"": { - ""archived-memos"": ""Notas Archivadas"", - ""no-archived-memos"": ""No hay notas archivadas."", - ""fetching-data"": ""obteniendo datos..."" - }, - ""editor"": { - ""editing"": ""Editando..."", - ""cancel-edit"": ""Cancelar edición"", - ""save"": ""Guardar"", - ""placeholder"": ""Alguna idea..."", - ""only-image-supported"": ""Solo se admiten archivos de imagen."", - ""cant-empty"": ""El contenido no puede estar vacío"", - ""local"": ""Local"", - ""resources"": ""Recursos"" - }, - ""memo"": { - ""view-detail"": ""Ver Detalles"", - ""copy"": ""Copiar"", - ""copy-link"": ""Copiar Enlace"", - ""visibility"": { - ""private"": ""Solo visible para ti"", - ""protected"": ""Visible para los miembros"", - ""public"": ""Todo el mundo lo puede ver"", - ""disabled"": ""Las notas públicas están deshabilitadas"" - } - }, - ""memo-list"": { - ""fetching-data"": ""obteniendo datos..."", - ""fetch-more"": ""Click aqui para obtener más información"" - }, - ""filter"": { - ""new-filter"": ""Nuevo Filtro"", - ""type"": { - ""tag"": ""Etiqueta"", - ""type"": ""Tipo"", - ""text"": ""Texto"", - ""display-time"": ""Fecha y Hora de Visualización"", - ""visibility"": ""Visibilidad"" + ""common"": { + ""about"": ""Acerca de"", + ""email"": ""Email"", + ""password"": ""Contraseña"", + ""username"": ""Usuario"", + ""nickname"": ""Apodo"", + ""save"": ""Guardar"", + ""close"": ""Cerrar"", + ""cancel"": ""Cancelar"", + ""create"": ""Crear"", + ""change"": ""Cambiar"", + ""confirm"": ""Confirmar"", + ""reset"": ""Restablecer"", + ""language"": ""Idioma"", + ""version"": ""Versión"", + ""pin"": ""Enganchar"", + ""unpin"": ""Desenganchar"", + ""edit"": ""Editar"", + ""restore"": ""Restaurar"", + ""delete"": ""Eliminar"", + ""null"": ""Nulo"", + ""share"": ""Compartir"", + ""archive"": ""Archivar"", + ""basic"": ""Básico"", + ""admin"": ""Administrador"", + ""explore"": ""Explorar"", + ""sign-in"": ""Iniciar sesión"", + ""sign-up"": ""Registrarse"", + ""sign-out"": ""Cerrar sesión"", + ""type"": ""Tipo"", + ""title"": ""Título"", + ""filter"": ""Filtros"", + ""tags"": ""Etiquetas"", + ""yourself"": ""Tu"", + ""changed"": ""cambiado"", + ""fold"": ""Plegar"", + ""expand"": ""Expandir"", + ""image"": ""Imagen"", + ""link"": ""Enlace"", + ""vacuum"": ""Vaciar"", + ""select"": ""Seleccionar"", + ""database"": ""Base de datos"", + ""avatar"": ""Avatar"", + ""mark"": ""Mark"" + }, + ""auth"": { + ""host-tip"": ""Te estás registrando como Anfitrión del Sitio."" }, - ""operator"": { - ""contains"": ""Contiene"", - ""not-contains"": ""No contiene"", - ""is"": ""Es"", - ""is-not"": ""No Es"", - ""before"": ""Antes"", - ""after"": ""Después"" + ""resource"": { + ""no-resources"": ""Sin recursos."", + ""fetching-data"": ""obteniendo datos..."", + ""copy-link"": ""Copiar Enlace"", + ""delete-resource"": ""Borrar Recurso"", + ""warning-text"": ""¿Está seguro de eliminar este recurso? ESTA ACCIÓN ES IRREVERSIBLE❗"", + ""linked-amount"": ""Importe de la nota vinculado"", + ""warning-text-unused"": ""¿Está seguro de eliminar estos recursos no utilizados? ESTA ACCIÓN ES IRREVERSIBLE❗"", + ""no-unused-resources"": ""No hay recursos sin utilizar"", + ""clear"": ""Limpiar"" }, - ""value"": { - ""not-tagged"": ""Sin etiquetas"", - ""linked"": ""Con enlaces"" + ""editor"": { + ""editing"": ""Editando..."", + ""cancel-edit"": ""Cancelar edición"", + ""save"": ""Guardar"", + ""placeholder"": ""Alguna idea..."", + ""only-image-supported"": ""Solo se admiten archivos de imagen."", + ""cant-empty"": ""El contenido no puede estar vacío"", + ""local"": ""Local"", + ""resources"": ""Recursos"" }, - ""text-placeholder"": ""Empieza por ^ para usar regex"" - }, - ""tag-list"": { - ""tip-text"": ""Escribe '#etiqueta' para crearlo"" - }, - ""search"": { - ""quickly-filter"": ""Filtro rápido"" - }, - ""setting"": { - ""my-account"": ""Mi Cuenta"", - ""preference"": ""Preferencias"", - ""member"": ""Miembros"", - ""member-list"": ""Lista de miembros"", - ""system"": ""Sistema"", - ""account-section"": { - ""title"": ""Información de la Cuenta"", - ""update-information"": ""Actualizar Información"", - ""change-password"": ""Cambiar Contraseña"" + ""memo"": { + ""view-detail"": ""Ver Detalles"", + ""copy-link"": ""Copiar Enlace"", + ""visibility"": { + ""private"": ""Solo visible para ti"", + ""protected"": ""Visible para los miembros"", + ""public"": ""Todo el mundo lo puede ver"", + ""disabled"": ""Las notas públicas están deshabilitadas"" + } }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Visibilidad predeterminada de las notas"", - ""enable-folding-memo"": ""Habilitar nota plegable"", - ""editor-font-style"": ""Estilo de fuente del editor"", - ""mobile-editor-style"": ""Estilo del editor móvil"", - ""default-memo-sort-option"": ""Hora de visualización de la nota"", - ""created_ts"": ""Hora de Creación"", - ""updated_ts"": ""Hora de Actualización"", - ""enable-double-click"": ""Habilitar doble clic para editar"", - ""auto-collapse"": ""Colapso automático"" + ""tag-list"": { + ""tip-text"": ""Escribe '#etiqueta' para crearlo"" }, - ""member-section"": { - ""create-a-member"": ""Crear un miembro"" + ""setting"": { + ""my-account"": ""Mi Cuenta"", + ""preference"": ""Preferencias"", + ""member"": ""Miembros"", + ""member-list"": ""Lista de miembros"", + ""system"": ""Sistema"", + ""account-section"": { + ""title"": ""Información de la Cuenta"", + ""update-information"": ""Actualizar Información"", + ""change-password"": ""Cambiar Contraseña"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Visibilidad predeterminada de las notas"", + ""enable-folding-memo"": ""Habilitar nota plegable"", + ""editor-font-style"": ""Estilo de fuente del editor"", + ""mobile-editor-style"": ""Estilo del editor móvil"", + ""default-memo-sort-option"": ""Hora de visualización de la nota"", + ""created_ts"": ""Hora de Creación"", + ""updated_ts"": ""Hora de Actualización"", + ""enable-double-click"": ""Habilitar doble clic para editar"", + ""auto-collapse"": ""Colapso automático"" + }, + ""member-section"": { + ""create-a-member"": ""Crear un miembro"" + }, + ""system-section"": { + ""server-name"": ""Nombre del Servidor"", + ""customize-server"": { + ""title"": ""Personalizar Servidor"", + ""default"": ""Por defecto es memos"", + ""icon-url"": ""Icono URL"" + }, + ""database-file-size"": ""Tamaño de la Base de Datos"", + ""allow-user-signup"": ""Permitir el registro de usuarios"", + ""additional-style"": ""Estilos adicionales"", + ""additional-script"": ""Scripts adicionales"", + ""additional-style-placeholder"": ""Código CSS adicional"", + ""additional-script-placeholder"": ""Código JavaScript adicional"", + ""disable-public-memos"": ""Deshabilitar notas públicas"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Según el sistema"", + ""light"": ""Siempre claro"", + ""dark"": ""Siempre oscuro"" + }, + ""storage"": ""Almacenamiento"", + ""sso"": ""SSO"", + ""storage-section"": { + ""storage-services-list"": ""Lista de servicios de almacenamiento"", + ""create-a-service"": ""Crear un servicio"", + ""update-a-service"": ""Actualizar un servicio"", + ""warning-text"": ""¿Está seguro de eliminar este servicio de almacenamiento? ESTA ACCIÓN ES IRREVERSIBLE❗"", + ""delete-storage"": ""Eliminar almacenamiento"" + } }, - ""system-section"": { - ""server-name"": ""Nombre del Servidor"", - ""customize-server"": { - ""title"": ""Personalizar Servidor"", - ""default"": ""Por defecto es memos"", - ""icon-url"": ""Icono URL"" - }, - ""database-file-size"": ""Tamaño de la Base de Datos"", - ""allow-user-signup"": ""Permitir el registro de usuarios"", - ""additional-style"": ""Estilos adicionales"", - ""additional-script"": ""Scripts adicionales"", - ""additional-style-placeholder"": ""Código CSS adicional"", - ""additional-script-placeholder"": ""Código JavaScript adicional"", - ""disable-public-memos"": ""Deshabilitar notas públicas"", - ""display-with-updated-time"": ""Display with updated time"" + ""amount-text"": { + ""memo_one"": ""NOTA"", + ""memo_many"": ""NOTAS"", + ""memo_other"": ""NOTAS"" }, - ""appearance-option"": { - ""system"": ""Según el sistema"", - ""light"": ""Siempre claro"", - ""dark"": ""Siempre oscuro"" + ""message"": { + ""memos-ready"": ""todas las notas están listas 🎉"", + ""restored-successfully"": ""Restaurado con éxito"", + ""memo-updated-datetime"": ""Fecha de creación de la nota modificada."", + ""invalid-created-datetime"": ""Fecha de creación no válida."", + ""change-memo-created-time"": ""Cambiar la hora de creación de la nota"", + ""memo-not-found"": ""Nota no encontrada."", + ""fill-all"": ""Rellena todos los campos."", + ""password-not-match"": ""Las contraseñas no coinciden."", + ""new-password-not-match"": ""Las nuevas contraseñas no coinciden."", + ""image-load-failed"": ""Error al subir la imagen"", + ""fill-form"": ""Rellena este formulario"", + ""login-failed"": ""Error al iniciar sesión"", + ""signup-failed"": ""Error al registrarse"", + ""user-not-found"": ""Usuario no encontrado"", + ""password-changed"": ""Contraseña cambiada"", + ""private-only"": ""Esta nota es privada."", + ""copied"": ""Copiado"", + ""succeed-copy-content"": ""Contenido copiado correctamente."", + ""succeed-copy-link"": ""Enlace copiado correctamente."", + ""change-resource-filename"": ""Cambiar el nombre de un archivo de recursos"", + ""resource-filename-updated"": ""El nombre del archivo de recursos se ha cambiado correctamente.."", + ""invalid-resource-filename"": ""Nombre de archivo de recursos no válido."", + ""click-to-save-the-image"": ""Haz clic para guardar la imagen"", + ""generating-the-screenshot"": ""Generando la captura de pantalla..."", + ""count-selected-resources"": ""Total seleccionado"", + ""succeed-vacuum-database"": ""Exito al limpiar la base de datos"", + ""succeed-update-additional-style"": ""Estilo adicional actualizado con éxito."", + ""succeed-copy-resource-link"": ""Enlace del recurso copiado con éxito."", + ""succeed-update-customized-profile"": ""Perfil personalizado con éxito."", + ""succeed-update-additional-script"": ""Script adicional actualizado con éxito."", + ""update-succeed"": ""Actualización exitosa"", + ""succeed-copy-code"": ""Código copiado con éxito."", + ""page-not-found"": ""404 - Página no encontrada 😥"" }, - ""storage"": ""Almacenamiento"", - ""sso"": ""SSO"", - ""storage-section"": { - ""storage-services-list"": ""Lista de servicios de almacenamiento"", - ""create-a-service"": ""Crear un servicio"", - ""update-a-service"": ""Actualizar un servicio"", - ""warning-text"": ""¿Está seguro de eliminar este servicio de almacenamiento? ESTA ACCIÓN ES IRREVERSIBLE❗"", - ""delete-storage"": ""Eliminar almacenamiento"" + ""days"": { + ""mon"": ""Lun"", + ""tue"": ""Mart"", + ""wed"": ""Miérc"", + ""thu"": ""Juev"", + ""fri"": ""Vier"", + ""sat"": ""Sáb"", + ""sun"": ""Dom"" } - }, - ""amount-text"": { - ""memo_one"": ""NOTA"", - ""memo_many"": ""NOTAS"", - ""memo_other"": ""NOTAS"", - ""tag_one"": ""ETIQUETA"", - ""tag_many"": ""ETIQUETAS"", - ""tag_other"": ""ETIQUETAS"", - ""day_one"": ""DIA"", - ""day_many"": ""DIAS"", - ""day_other"": ""DIAS"" - }, - ""message"": { - ""no-memos"": ""no hay notas 🌃"", - ""memos-ready"": ""todas las notas están listas 🎉"", - ""restored-successfully"": ""Restaurado con éxito"", - ""memo-updated-datetime"": ""Fecha de creación de la nota modificada."", - ""invalid-created-datetime"": ""Fecha de creación no válida."", - ""change-memo-created-time"": ""Cambiar la hora de creación de la nota"", - ""memo-not-found"": ""Nota no encontrada."", - ""fill-all"": ""Rellena todos los campos."", - ""password-not-match"": ""Las contraseñas no coinciden."", - ""new-password-not-match"": ""Las nuevas contraseñas no coinciden."", - ""image-load-failed"": ""Error al subir la imagen"", - ""fill-form"": ""Rellena este formulario"", - ""login-failed"": ""Error al iniciar sesión"", - ""signup-failed"": ""Error al registrarse"", - ""user-not-found"": ""Usuario no encontrado"", - ""password-changed"": ""Contraseña cambiada"", - ""private-only"": ""Esta nota es privada."", - ""copied"": ""Copiado"", - ""succeed-copy-content"": ""Contenido copiado correctamente."", - ""succeed-copy-link"": ""Enlace copiado correctamente."", - ""change-resource-filename"": ""Cambiar el nombre de un archivo de recursos"", - ""resource-filename-updated"": ""El nombre del archivo de recursos se ha cambiado correctamente.."", - ""invalid-resource-filename"": ""Nombre de archivo de recursos no válido."", - ""click-to-save-the-image"": ""Haz clic para guardar la imagen"", - ""generating-the-screenshot"": ""Generando la captura de pantalla..."", - ""count-selected-resources"": ""Total seleccionado"", - ""too-short"": ""Demasiado corto"", - ""too-long"": ""Demasiado largo"", - ""not-allow-space"": ""No se admiten espacios"", - ""not-allow-chinese"": ""El chino no está permitido"", - ""succeed-vacuum-database"": ""Exito al limpiar la base de datos"", - ""succeed-update-additional-style"": ""Estilo adicional actualizado con éxito."", - ""succeed-copy-resource-link"": ""Enlace del recurso copiado con éxito."", - ""succeed-update-customized-profile"": ""Perfil personalizado con éxito."", - ""succeed-update-additional-script"": ""Script adicional actualizado con éxito."", - ""update-succeed"": ""Actualización exitosa"", - ""succeed-copy-code"": ""Código copiado con éxito."", - ""page-not-found"": ""404 - Página no encontrada 😥"" - }, - ""days"": { - ""monday"": ""Lunes"", - ""mon"": ""Lun"", - ""tuesday"": ""Martes"", - ""tue"": ""Mart"", - ""wednesday"": ""Miércoles"", - ""wed"": ""Miérc"", - ""thursday"": ""Jueves"", - ""thu"": ""Juev"", - ""friday"": ""Viernes"", - ""fri"": ""Vier"", - ""saturday"": ""Sábado"", - ""sat"": ""Sáb"", - ""sunday"": ""Domingo"", - ""sun"": ""Dom"" - } } diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json index b6b5e4b2764dd..24b44c041b757 100644 --- a/web/src/locales/fr.json +++ b/web/src/locales/fr.json @@ -1,261 +1,190 @@ { - ""common"": { - ""about"": ""À propos"", - ""email"": ""Email"", - ""password"": ""Mot de passe"", - ""repeat-password-short"": ""Répétez"", - ""repeat-password"": ""Répétez le mot de passe"", - ""new-password"": ""Nouveau mot de passe"", - ""repeat-new-password"": ""Répétez le nouveau mot de passe"", - ""username"": ""Nom d'utilisateur"", - ""nickname"": ""Surnom"", - ""save"": ""Enregistrer"", - ""close"": ""Fermer"", - ""cancel"": ""Annuler"", - ""create"": ""Créer"", - ""change"": ""Changer"", - ""confirm"": ""Confirmer"", - ""reset"": ""Réinitialiser"", - ""language"": ""Langue"", - ""version"": ""Version"", - ""pin"": ""Épinglé"", - ""unpin"": ""Détacher"", - ""edit"": ""Modifier"", - ""restore"": ""Restaurer"", - ""delete"": ""Supprimer"", - ""null"": ""Nulle"", - ""share"": ""Partager"", - ""archive"": ""Archive"", - ""basic"": ""Base"", - ""admin"": ""Admin"", - ""explore"": ""Explorez"", - ""sign-in"": ""Se connecter"", - ""sign-up"": ""S'inscrire"", - ""sign-out"": ""Se déconnecter"", - ""back-to-home"": ""Retour à l'accueil"", - ""type"": ""Type"", - ""title"": ""Titre"", - ""filter"": ""Filtre"", - ""tags"": ""Étiquettes"", - ""yourself"": ""Vous-même"", - ""archived-at"": ""Archivé à"", - ""changed"": ""modifié"", - ""update-on"": ""Mise à jour sur"", - ""fold"": ""Plier"", - ""expand"": ""Développer"", - ""image"": ""Image"", - ""link"": ""Lien"", - ""vacuum"": ""Nettoyer"", - ""select"": ""Select"", - ""avatar"": ""Avatar"", - ""database"": ""Base de données"", - ""mark"": ""Marquer"" - }, - ""auth"": { - ""signup-as-host"": ""S'inscrire en tant qu'hôte"", - ""host-tip"": ""Vous vous inscrivez en tant qu'hébergeur du site."", - ""not-host-tip"": ""Si vous n'avez pas de compte, veuillez contacter l'hôte du site."" - }, - ""sidebar"": { - ""daily-review"": ""Bilan quotidien"", - ""resources"": ""Ressources"", - ""setting"": ""Réglages"", - ""archived"": ""Archivé"" - }, - ""resource"": { - ""description"": ""Visualisez vos ressources statiques dans des mémos, par exemple des images."", - ""no-resources"": ""Aucune ressource."", - ""fetching-data"": ""récupération des données..."", - ""upload"": ""Télécharger"", - ""preview"": ""Aperçu"", - ""copy-link"": ""Copier le lien"", - ""delete-resource"": ""Supprimer la ressource"", - ""warning-text"": ""Êtes-vous sûr de vouloir supprimer cette ressource ? CETTE ACTION EST IRRÉVERSIBLE❗"", - ""linked-amount"": ""Montant du mémo lié"", - ""rename"": ""Renommer"", - ""warning-text-unused"": ""Etes-vous sûr de vouloir supprimer ces ressources inutilisées ? CETTE ACTION EST IRRÉVERSIBLE❗"", - ""no-unused-resources"": ""Aucune ressource inutilisée"", - ""name"": ""Nom"", - ""clear"": ""Nettoyer"" - }, - ""archived"": { - ""archived-memos"": ""Mémos archivés"", - ""no-archived-memos"": ""Aucun mémo archivé."", - ""fetching-data"": ""récupération des données..."" - }, - ""editor"": { - ""editing"": ""Édition..."", - ""cancel-edit"": ""Annuler l'édition"", - ""save"": ""Sauvegarder"", - ""placeholder"": ""Une idée..."", - ""only-image-supported"": ""Seul le fichier image est pris en charge."", - ""cant-empty"": ""Le contenu ne doit pas être vide"", - ""local"": ""Local"", - ""resources"": ""Ressources"" - }, - ""memo"": { - ""view-detail"": ""Voir le détail"", - ""copy"": ""Copier"", - ""copy-link"": ""Copier le lien"", - ""visibility"": { - ""private"": ""Privé"", - ""protected"": ""Visible par les membres"", - ""public"": ""Tous peuvent voir"", - ""disabled"": ""Les mémos publics sont désactivés"" - } - }, - ""memo-list"": { - ""fetching-data"": ""récupération des données..."", - ""fetch-more"": ""Cliquez ici pour en savoir plus"" - }, - ""filter"": { - ""new-filter"": ""Nouveau filtre"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Type"", - ""text"": ""Texte"", - ""display-time"": ""Horodatage"", - ""visibility"": ""Visibilité"" + ""common"": { + ""about"": ""À propos"", + ""email"": ""Email"", + ""password"": ""Mot de passe"", + ""username"": ""Nom d'utilisateur"", + ""nickname"": ""Surnom"", + ""save"": ""Enregistrer"", + ""close"": ""Fermer"", + ""cancel"": ""Annuler"", + ""create"": ""Créer"", + ""change"": ""Changer"", + ""confirm"": ""Confirmer"", + ""reset"": ""Réinitialiser"", + ""language"": ""Langue"", + ""version"": ""Version"", + ""pin"": ""Épinglé"", + ""unpin"": ""Détacher"", + ""edit"": ""Modifier"", + ""restore"": ""Restaurer"", + ""delete"": ""Supprimer"", + ""null"": ""Nulle"", + ""share"": ""Partager"", + ""archive"": ""Archive"", + ""basic"": ""Base"", + ""admin"": ""Admin"", + ""explore"": ""Explorez"", + ""sign-in"": ""Se connecter"", + ""sign-up"": ""S'inscrire"", + ""sign-out"": ""Se déconnecter"", + ""type"": ""Type"", + ""title"": ""Titre"", + ""filter"": ""Filtre"", + ""tags"": ""Étiquettes"", + ""yourself"": ""Vous-même"", + ""changed"": ""modifié"", + ""fold"": ""Plier"", + ""expand"": ""Développer"", + ""image"": ""Image"", + ""link"": ""Lien"", + ""vacuum"": ""Nettoyer"", + ""select"": ""Select"", + ""avatar"": ""Avatar"", + ""database"": ""Base de données"", + ""mark"": ""Marquer"" + }, + ""auth"": { + ""host-tip"": ""Vous vous inscrivez en tant qu'hébergeur du site."" }, - ""operator"": { - ""contains"": ""Contient"", - ""not-contains"": ""Ne contient pas"", - ""is"": ""Est"", - ""is-not"": ""N'est pas"", - ""before"": ""Avant"", - ""after"": ""Après"" + ""resource"": { + ""no-resources"": ""Aucune ressource."", + ""fetching-data"": ""récupération des données..."", + ""copy-link"": ""Copier le lien"", + ""delete-resource"": ""Supprimer la ressource"", + ""warning-text"": ""Êtes-vous sûr de vouloir supprimer cette ressource ? CETTE ACTION EST IRRÉVERSIBLE❗"", + ""linked-amount"": ""Montant du mémo lié"", + ""warning-text-unused"": ""Etes-vous sûr de vouloir supprimer ces ressources inutilisées ? CETTE ACTION EST IRRÉVERSIBLE❗"", + ""no-unused-resources"": ""Aucune ressource inutilisée"", + ""clear"": ""Nettoyer"" }, - ""value"": { - ""not-tagged"": ""Pas d'étiquette"", - ""linked"": ""A des liens"" + ""editor"": { + ""editing"": ""Édition..."", + ""cancel-edit"": ""Annuler l'édition"", + ""save"": ""Sauvegarder"", + ""placeholder"": ""Une idée..."", + ""only-image-supported"": ""Seul le fichier image est pris en charge."", + ""cant-empty"": ""Le contenu ne doit pas être vide"", + ""local"": ""Local"", + ""resources"": ""Ressources"" }, - ""text-placeholder"": ""Commence par ^ pour utiliser regex"" - }, - ""tag-list"": { - ""tip-text"": ""Entrez `#tag ` pour créer"" - }, - ""search"": { - ""quickly-filter"": ""Filtrer rapidement"" - }, - ""setting"": { - ""my-account"": ""Mon compte"", - ""preference"": ""Préférences"", - ""member"": ""Membre"", - ""member-list"": ""Liste des membres"", - ""system"": ""Système"", - ""account-section"": { - ""title"": ""Informations sur le compte"", - ""update-information"": ""Mettre à jour les informations"", - ""change-password"": ""Modifier le mot de passe"" + ""memo"": { + ""view-detail"": ""Voir le détail"", + ""copy-link"": ""Copier le lien"", + ""visibility"": { + ""private"": ""Privé"", + ""protected"": ""Visible par les membres"", + ""public"": ""Tous peuvent voir"", + ""disabled"": ""Les mémos publics sont désactivés"" + } }, - ""preference-section"": { - ""theme"": ""Thème"", - ""default-memo-visibility"": ""Visibilité du mémo par défaut"", - ""enable-folding-memo"": ""Activer le mémo pliable"", - ""editor-font-style"": ""Style de police de l'éditeur"", - ""mobile-editor-style"": ""Style de l'éditeur mobile"", - ""default-memo-sort-option"": ""Tri par défaut des mémos"", - ""created_ts"": ""Heure de création"", - ""updated_ts"": ""Heure de mise à jour"", - ""enable-double-click"": ""Activer le double-clic"", - ""auto-collapse"": ""Réduction automatique"" + ""tag-list"": { + ""tip-text"": ""Entrez `#tag ` pour créer"" }, - ""member-section"": { - ""create-a-member"": ""Créer un membre"" + ""setting"": { + ""my-account"": ""Mon compte"", + ""preference"": ""Préférences"", + ""member"": ""Membre"", + ""member-list"": ""Liste des membres"", + ""system"": ""Système"", + ""account-section"": { + ""title"": ""Informations sur le compte"", + ""update-information"": ""Mettre à jour les informations"", + ""change-password"": ""Modifier le mot de passe"" + }, + ""preference-section"": { + ""theme"": ""Thème"", + ""default-memo-visibility"": ""Visibilité du mémo par défaut"", + ""enable-folding-memo"": ""Activer le mémo pliable"", + ""editor-font-style"": ""Style de police de l'éditeur"", + ""mobile-editor-style"": ""Style de l'éditeur mobile"", + ""default-memo-sort-option"": ""Tri par défaut des mémos"", + ""created_ts"": ""Heure de création"", + ""updated_ts"": ""Heure de mise à jour"", + ""enable-double-click"": ""Activer le double-clic"", + ""auto-collapse"": ""Réduction automatique"" + }, + ""member-section"": { + ""create-a-member"": ""Créer un membre"" + }, + ""system-section"": { + ""server-name"": ""Nom du serveur"", + ""customize-server"": { + ""title"": ""Serveur personnalisé"", + ""default"": ""Par défaut memos"", + ""icon-url"": ""URL de l'icône"" + }, + ""database-file-size"": ""Taille de la base de données"", + ""allow-user-signup"": ""Autoriser l'inscription des utilisateurs"", + ""additional-style"": ""Style supplémentaire"", + ""additional-script"": ""Script supplémentaire"", + ""additional-style-placeholder"": ""Codes CSS supplémentaires"", + ""additional-script-placeholder"": ""Codes JavaScript supplémentaires"", + ""disable-public-memos"": ""Désactiver les commentaires publics"", + ""display-with-updated-time"": ""Afficher avec l'horodatage"" + }, + ""storage-section"": { + ""delete-storage"": ""Effacer le stockage"", + ""storage-services-list"": ""Liste des services de stockage"", + ""create-a-service"": ""Créer un service"", + ""update-a-service"": ""Mettre à jour un service"", + ""warning-text"": ""Etes-vous sûr de vouloir supprimer ce service de stockage ? CETTE ACTION EST IRRÉVERSIBLE❗"" + }, + ""storage"": ""Stockage"", + ""sso"": ""SSO"", + ""appearance-option"": { + ""system"": ""Identique au système"", + ""light"": ""Toujours clair"", + ""dark"": ""Toujours sombre"" + } }, - ""system-section"": { - ""server-name"": ""Nom du serveur"", - ""customize-server"": { - ""title"": ""Serveur personnalisé"", - ""default"": ""Par défaut memos"", - ""icon-url"": ""URL de l'icône"" - }, - ""database-file-size"": ""Taille de la base de données"", - ""allow-user-signup"": ""Autoriser l'inscription des utilisateurs"", - ""additional-style"": ""Style supplémentaire"", - ""additional-script"": ""Script supplémentaire"", - ""additional-style-placeholder"": ""Codes CSS supplémentaires"", - ""additional-script-placeholder"": ""Codes JavaScript supplémentaires"", - ""disable-public-memos"": ""Désactiver les commentaires publics"", - ""display-with-updated-time"": ""Afficher avec l'horodatage"" + ""amount-text"": { + ""memo_one"": ""MEMO"", + ""memo_many"": """", + ""memo_other"": ""ETIQUETTES"" }, - ""storage-section"": { - ""delete-storage"": ""Effacer le stockage"", - ""storage-services-list"": ""Liste des services de stockage"", - ""create-a-service"": ""Créer un service"", - ""update-a-service"": ""Mettre à jour un service"", - ""warning-text"": ""Etes-vous sûr de vouloir supprimer ce service de stockage ? CETTE ACTION EST IRRÉVERSIBLE❗"" + ""message"": { + ""memos-ready"": ""tous les mémos sont prêts 🎉"", + ""restored-successfully"": ""Restauré avec succès"", + ""memo-updated-datetime"": ""La date et l'heure de création du mémo ont été modifiées."", + ""invalid-created-datetime"": ""Date/heure de création non valide."", + ""change-memo-created-time"": ""Modifier l'heure de création du mémo"", + ""memo-not-found"": ""Mémo introuvable"", + ""fill-all"": ""Veuillez remplir tous les champs."", + ""new-password-not-match"": ""Les mots de passe ne correspondent pas"", + ""image-load-failed"": ""Le chargement de l'image a échoué"", + ""fill-form"": ""Veuillez remplir ce formulaire"", + ""login-failed"": ""Connexion échouée"", + ""signup-failed"": ""L'inscription a échoué"", + ""user-not-found"": ""Utilisateur introuvable"", + ""password-not-match"": ""Passwords do not match."", + ""password-changed"": ""Mot de passe modifié"", + ""private-only"": ""Ce mémo est uniquement privé."", + ""copied"": ""Copié"", + ""succeed-copy-content"": ""La copie dans le presse-papiers a été effectuée avec succès"", + ""succeed-copy-link"": ""Succeed to copy link to clipboard."", + ""change-resource-filename"": ""Changer le nom du fichier de ressources"", + ""resource-filename-updated"": ""Le nom de fichier de la ressource a changé."", + ""invalid-resource-filename"": ""Nom de fichier invalide."", + ""click-to-save-the-image"": ""Cliquez pour enregistrer l'image"", + ""generating-the-screenshot"": ""Génération de la capture d'écran..."", + ""count-selected-resources"": ""Total de la sélection"", + ""succeed-vacuum-database"": ""Nettoyage de la base de données effectuée"", + ""succeed-update-additional-style"": ""Mise à jour des styles additionnels effectuée"", + ""succeed-copy-resource-link"": ""Copie du lien vers le presse-papier effectuée"", + ""succeed-update-customized-profile"": ""Mise à jour du profil effectuée"", + ""succeed-update-additional-script"": ""Mise à jour des scripts additionnels effectuée"", + ""update-succeed"": ""Mise à jour effectuée"", + ""succeed-copy-code"": ""Copie du code dans le presse-papier effectuée."", + ""page-not-found"": ""404 - Page non trouvée 😥"" }, - ""storage"": ""Stockage"", - ""sso"": ""SSO"", - ""appearance-option"": { - ""system"": ""Identique au système"", - ""light"": ""Toujours clair"", - ""dark"": ""Toujours sombre"" + ""days"": { + ""mon"": ""Lu"", + ""tue"": ""Ma"", + ""wed"": ""Me"", + ""thu"": ""Je"", + ""fri"": ""Ve"", + ""sat"": ""Sa"", + ""sun"": ""Di"" } - }, - ""amount-text"": { - ""memo_one"": ""MEMO"", - ""tag_one"": ""ÉTIQUETTE"", - ""day_one"": ""JOUR"", - ""day_other"": ""JOURS"", - ""memo_other"": ""ETIQUETTES"", - ""tag_other"": ""ETIQUETTES"" - }, - ""message"": { - ""no-memos"": ""pas de mémos 🌃"", - ""memos-ready"": ""tous les mémos sont prêts 🎉"", - ""restored-successfully"": ""Restauré avec succès"", - ""memo-updated-datetime"": ""La date et l'heure de création du mémo ont été modifiées."", - ""invalid-created-datetime"": ""Date/heure de création non valide."", - ""change-memo-created-time"": ""Modifier l'heure de création du mémo"", - ""memo-not-found"": ""Mémo introuvable"", - ""fill-all"": ""Veuillez remplir tous les champs."", - ""new-password-not-match"": ""Les mots de passe ne correspondent pas"", - ""image-load-failed"": ""Le chargement de l'image a échoué"", - ""fill-form"": ""Veuillez remplir ce formulaire"", - ""login-failed"": ""Connexion échouée"", - ""signup-failed"": ""L'inscription a échoué"", - ""user-not-found"": ""Utilisateur introuvable"", - ""password-not-match"": ""Passwords do not match."", - ""password-changed"": ""Mot de passe modifié"", - ""private-only"": ""Ce mémo est uniquement privé."", - ""copied"": ""Copié"", - ""succeed-copy-content"": ""La copie dans le presse-papiers a été effectuée avec succès"", - ""succeed-copy-link"": ""Succeed to copy link to clipboard."", - ""change-resource-filename"": ""Changer le nom du fichier de ressources"", - ""resource-filename-updated"": ""Le nom de fichier de la ressource a changé."", - ""invalid-resource-filename"": ""Nom de fichier invalide."", - ""click-to-save-the-image"": ""Cliquez pour enregistrer l'image"", - ""generating-the-screenshot"": ""Génération de la capture d'écran..."", - ""count-selected-resources"": ""Total de la sélection"", - ""too-short"": ""Trop court"", - ""too-long"": ""Trop long"", - ""not-allow-space"": ""Espaces non acceptés"", - ""not-allow-chinese"": ""Caractères chinois non acceptés"", - ""succeed-vacuum-database"": ""Nettoyage de la base de données effectuée"", - ""succeed-update-additional-style"": ""Mise à jour des styles additionnels effectuée"", - ""succeed-copy-resource-link"": ""Copie du lien vers le presse-papier effectuée"", - ""succeed-update-customized-profile"": ""Mise à jour du profil effectuée"", - ""succeed-update-additional-script"": ""Mise à jour des scripts additionnels effectuée"", - ""update-succeed"": ""Mise à jour effectuée"", - ""succeed-copy-code"": ""Copie du code dans le presse-papier effectuée."", - ""page-not-found"": ""404 - Page non trouvée 😥"" - }, - ""days"": { - ""monday"": ""Lundi"", - ""mon"": ""Lu"", - ""tuesday"": ""Mardi"", - ""tue"": ""Ma"", - ""wednesday"": ""Mercredi"", - ""wed"": ""Me"", - ""thursday"": ""Jeudi"", - ""thu"": ""Je"", - ""friday"": ""Vendredi"", - ""fri"": ""Ve"", - ""saturday"": ""Samedi"", - ""sat"": ""Sa"", - ""sunday"": ""Dimanche"", - ""sun"": ""Di"" - } } diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json index 8f070336a5230..ba6247dc15a49 100644 --- a/web/src/locales/hi.json +++ b/web/src/locales/hi.json @@ -1,406 +1,278 @@ { - ""common"": { - ""memos-slogan"": ""एक हल्का, स्व-होस्टेड मेमो हब। ओपन सोर्स और हमेशा के लिए मुफ्त।"", - ""about"": ""के बारे में"", - ""home"": ""होम"", - ""resources"": ""संसाधन"", - ""settings"": ""सेटिंग्स"", - ""archived"": ""संग्रहीत"", - ""email"": ""ईमेल"", - ""password"": ""पासवर्ड"", - ""avatar"": ""अवतार"", - ""username"": ""उपयोगकर्ता नाम"", - ""nickname"": ""उपनाम"", - ""save"": ""सहेजें"", - ""close"": ""बंद करें"", - ""cancel"": ""रद्द करें"", - ""create"": ""बनाएँ"", - ""update"": ""अपडेट करें"", - ""change"": ""बदलें"", - ""confirm"": ""पुष्टि करें"", - ""reset"": ""रीसेट करें"", - ""language"": ""भाषा"", - ""version"": ""संस्करण"", - ""pin"": ""पिन करें"", - ""unpin"": ""अनपिन करें"", - ""edit"": ""संपादित करें"", - ""restore"": ""पुनर्स्थापित करें"", - ""delete"": ""हटाएँ"", - ""null"": ""शून्य"", - ""share"": ""साझा करें"", - ""archive"": ""संग्रहीत करें"", - ""basic"": ""मूल"", - ""admin"": ""एडमिन"", - ""explore"": ""अन्वेषण करें"", - ""sign-in"": ""साइन इन करें"", - ""sign-in-with"": ""{{provider}} के साथ साइन इन करें"", - ""or"": ""या"", - ""sign-up"": ""साइन अप करें"", - ""sign-out"": ""साइन आउट करें"", - ""type"": ""प्रकार"", - ""title"": ""शीर्षक"", - ""filter"": ""फ़िल्टर"", - ""filter-period"": ""{{from}} से {{to}} तक"", - ""tags"": ""टैग"", - ""yourself"": ""खुद"", - ""changed"": ""बदल गया"", - ""fold"": ""फोल्ड"", - ""expand"": ""विस्तार करें"", - ""image"": ""तस्वीर"", - ""link"": ""लिंक"", - ""vacuum"": ""वैक्यूम"", - ""select"": ""चयन करें"", - ""database"": ""डेटाबेस"", - ""upload"": ""अपलोड करें"", - ""preview"": ""पूर्वावलोकन"", - ""rename"": ""नाम बदलें"", - ""clear"": ""साफ़ करें"", - ""name"": ""नाम"", - ""visibility"": ""दृश्यता"", - ""learn-more"": ""अधिक जानें"", - ""beta"": ""बीटा"", - ""new"": ""नया"", - ""dialog"": { - ""error"": ""त्रुटि"", - ""help"": ""मदद"", - ""info"": ""सूचना"", - ""success"": ""सफलता"", - ""warning"": ""चेतावनी"" + ""common"": { + ""about"": ""के बारे में"", + ""home"": ""होम"", + ""resources"": ""संसाधन"", + ""settings"": ""सेटिंग्स"", + ""archived"": ""संग्रहीत"", + ""email"": ""ईमेल"", + ""password"": ""पासवर्ड"", + ""avatar"": ""अवतार"", + ""username"": ""उपयोगकर्ता नाम"", + ""nickname"": ""उपनाम"", + ""save"": ""सहेजें"", + ""close"": ""बंद करें"", + ""cancel"": ""रद्द करें"", + ""create"": ""बनाएँ"", + ""update"": ""अपडेट करें"", + ""change"": ""बदलें"", + ""confirm"": ""पुष्टि करें"", + ""reset"": ""रीसेट करें"", + ""language"": ""भाषा"", + ""version"": ""संस्करण"", + ""pin"": ""पिन करें"", + ""unpin"": ""अनपिन करें"", + ""edit"": ""संपादित करें"", + ""restore"": ""पुनर्स्थापित करें"", + ""delete"": ""हटाएँ"", + ""null"": ""शून्य"", + ""share"": ""साझा करें"", + ""archive"": ""संग्रहीत करें"", + ""basic"": ""मूल"", + ""admin"": ""एडमिन"", + ""explore"": ""अन्वेषण करें"", + ""sign-in"": ""साइन इन करें"", + ""sign-in-with"": ""{{provider}} के साथ साइन इन करें"", + ""or"": ""या"", + ""sign-up"": ""साइन अप करें"", + ""sign-out"": ""साइन आउट करें"", + ""type"": ""प्रकार"", + ""title"": ""शीर्षक"", + ""filter"": ""फ़िल्टर"", + ""filter-period"": ""{{from}} से {{to}} तक"", + ""tags"": ""टैग"", + ""yourself"": ""खुद"", + ""changed"": ""बदल गया"", + ""fold"": ""फोल्ड"", + ""expand"": ""विस्तार करें"", + ""image"": ""तस्वीर"", + ""link"": ""लिंक"", + ""vacuum"": ""वैक्यूम"", + ""select"": ""चयन करें"", + ""database"": ""डेटाबेस"", + ""upload"": ""अपलोड करें"", + ""preview"": ""पूर्वावलोकन"", + ""rename"": ""नाम बदलें"", + ""clear"": ""साफ़ करें"", + ""name"": ""नाम"", + ""visibility"": ""दृश्यता"", + ""learn-more"": ""अधिक जानें"", + ""beta"": ""बीटा"", + ""new"": ""नया"", + ""mark"": ""चिह्नित"" }, - ""mark"": ""चिह्नित"" - }, - ""router"": { - ""back-to-home"": ""होम पर वापस जाएं"" - }, - ""auth"": { - ""signup-as-host"": ""होस्ट के रूप में साइन अप करें"", - ""host-tip"": ""आप साइट होस्ट के रूप में पंजीकृत हो रहे हैं।"", - ""not-host-tip"": ""अगर आपके पास खाता नहीं है, कृपया साइट होस्ट से संपर्क करें।"", - ""new-password"": ""नया पासवर्ड"", - ""repeat-new-password"": ""नए पासवर्ड को दोहराएं"" - }, - ""editor"": { - ""editing"": ""संपादन कर रहे हैं..."", - ""cancel-edit"": ""संपादन रद्द करें"", - ""save"": ""सहेजें"", - ""placeholder"": ""कोई विचार..."", - ""only-image-supported"": ""केवल छवि फ़ाइल समर्थित है।"", - ""cant-empty"": ""सामग्री खाली नहीं हो सकती"", - ""local"": ""स्थानीय"", - ""resources"": ""संसाधन"" - }, - ""memo"": { - ""view-detail"": ""विवरण देखें"", - ""copy-link"": ""लिंक कॉपी करें"", - ""embed"": ""एम्बेड करें"", - ""archived-memos"": ""संग्रहीत मेमो"", - ""no-archived-memos"": ""कोई संग्रहीत मेमो नहीं।"", - ""fetching-data"": ""डेटा लाया जा रहा है..."", - ""fetch-more"": ""और लाने के लिए यहां क्लिक करें"", - ""archived-at"": ""संग्रहीत किया गया"", - ""search-placeholder"": ""मेमो खोजें"", - ""visibility"": { - ""private"": ""निजी"", - ""protected"": ""सदस्यों को दिखाई देता है"", - ""public"": ""सभी के लिए सार्वजनिक"", - ""disabled"": ""सार्वजनिक मेमो अक्षम किए गए हैं"" + ""auth"": { + ""host-tip"": ""आप साइट होस्ट के रूप में पंजीकृत हो रहे हैं।"", + ""new-password"": ""नया पासवर्ड"", + ""repeat-new-password"": ""नए पासवर्ड को दोहराएं"" }, - ""delete-memo"": ""मेमो हटाएँ"", - ""delete-confirm"": ""क्या आप इस मेमो को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"" - }, - ""resource"": { - ""no-resources"": ""कोई संसाधन नहीं।"", - ""fetching-data"": ""डेटा लाया जा रहा है..."", - ""copy-link"": ""लिंक कॉपी करें"", - ""reset-link"": ""लिंक रीसेट करें"", - ""reset-resource-link"": ""संसाधन लिंक रीसेट करें"", - ""reset-link-prompt"": ""क्या आप लिंक को रीसेट करने के लिए सुनिश्चित हैं?\nयह सभी वर्तमान लिंक उपयोगों को बिगाड़ देगा।\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""delete-resource"": ""संसाधन हटाएँ"", - ""linked-amount"": ""लिंक की गई राशि"", - ""warning-text"": ""क्या आप इस संसाधन को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""warning-text-unused"": ""क्या आप इन अपयुक्त संसाधनों को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""no-unused-resources"": ""कोई अपयुक्त संसाधन नहीं हैं"", - ""delete-selected-resources"": ""चयनित संसाधनों को हटाएँ"", - ""no-files-selected"": ""कोई फ़ाइलें चयनित नहीं हैं❗"", - ""upload-successfully"": ""सफलतापूर्वक अपलोड किया गया"", - ""file-drag-drop-prompt"": ""फ़ाइल अपलोड करने के लिए अपनी फ़ाइल यहां खींचें और छोड़ें"", - ""search-bar-placeholder"": ""संसाधन खोजें"", - ""clear"": ""साफ़ करें"", - ""create-dialog"": { - ""title"": ""संसाधन बनाएँ"", - ""upload-method"": ""अपलोड विधि"", - ""local-file"": { - ""option"": ""स्थानीय फ़ाइल"", - ""choose"": ""फ़ाइल चुनें..."" - }, - ""external-link"": { - ""option"": ""बाह्य लिंक"", - ""link"": ""लिंक"", - ""link-placeholder"": ""https://the.link.to/your/resource"", - ""file-name"": ""फ़ाइल का नाम"", - ""file-name-placeholder"": ""फ़ाइल का नाम"", - ""type"": ""प्रकार"", - ""type-placeholder"": ""फ़ाइल प्रकार"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""बनाने के लिए `#tag` इनपुट करें"", - ""create-tag"": ""टैग बनाएँ"", - ""all-tags"": ""सभी टैग"", - ""tag-name"": ""टैग_नाम"" - }, - ""daily-review"": { - ""title"": ""दैनिक समीक्षा"", - ""no-memos"": ""उफ़, कुछ भी नहीं है।"" - }, - ""setting"": { - ""my-account"": ""मेरा खाता"", - ""preference"": ""प्राथमिकता"", - ""member"": ""सदस्य"", - ""member-list"": ""सदस्य सूची"", - ""system"": ""सिस्टम"", - ""openai"": ""OpenAI"", - ""storage"": ""संग्रहण"", - ""sso"": ""एसएसओ"", - ""account-section"": { - ""title"": ""खाता जानकारी"", - ""username-note"": ""साइन इन करने के लिए उपयोग किया जाता है"", - ""nickname-note"": ""बैनर में प्रदर्शित किया जाता है"", - ""email-note"": ""वैकल्पिक"", - ""update-information"": ""जानकारी अपडेट करें"", - ""change-password"": ""पासवर्ड बदलें"", - ""reset-api"": ""API रीसेट करें"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""OpenAPI कुंजी रीसेट करें"", - ""openapi-reset-warning"": ""❗ मौजूदा API अमान्य हो जाएगा और एक नया जेनरेट होगा।\n\nक्या आप नया जेनरेट करना चाहते हैं?"", - ""openapi-sample-post"": ""नमस्ते #memos से {{url}}"" + ""editor"": { + ""editing"": ""संपादन कर रहे हैं..."", + ""cancel-edit"": ""संपादन रद्द करें"", + ""save"": ""सहेजें"", + ""placeholder"": ""कोई विचार..."", + ""only-image-supported"": ""केवल छवि फ़ाइल समर्थित है।"", + ""cant-empty"": ""सामग्री खाली नहीं हो सकती"", + ""local"": ""स्थानीय"", + ""resources"": ""संसाधन"" }, - ""preference-section"": { - ""theme"": ""थीम"", - ""default-memo-visibility"": ""डिफ़ॉल्ट मेमो दृश्यता"", - ""default-resource-visibility"": ""डिफ़ॉल्ट संसाधन दृश्यता"", - ""enable-folding-memo"": ""मेमो फोल्ड करने की सक्षमता"", - ""enable-double-click"": ""दोहरी क्लिक संपादित करने की सक्षमता"", - ""editor-font-style"": ""संपादक फ़ॉन्ट शैली"", - ""mobile-editor-style"": ""मोबाइल संपादक शैली"", - ""default-memo-sort-option"": ""मेमो प्रदर्शन समय"", - ""telegram-user-id"": ""टेलीग्राम उपयोगकर्ता आईडी"", - ""telegram-user-id-placeholder"": ""अपने टेलीग्राम बॉट को कोई शब्द भेजें और प्राप्त करें"", - ""created_ts"": ""समय बनाया गया"", - ""updated_ts"": ""समय अद्यतन किया गया"", - ""daily-review-time-offset"": ""दैनिक समीक्षा समय ऑफ़सेट"", - ""auto-collapse"": ""ऑटो संक्षेपित"" + ""memo"": { + ""view-detail"": ""विवरण देखें"", + ""copy-link"": ""लिंक कॉपी करें"", + ""embed"": ""एम्बेड करें"", + ""archived-memos"": ""संग्रहीत मेमो"", + ""no-archived-memos"": ""कोई संग्रहीत मेमो नहीं।"", + ""fetching-data"": ""डेटा लाया जा रहा है..."", + ""fetch-more"": ""और लाने के लिए यहां क्लिक करें"", + ""archived-at"": ""संग्रहीत किया गया"", + ""search-placeholder"": ""मेमो खोजें"", + ""visibility"": { + ""private"": ""निजी"", + ""protected"": ""सदस्यों को दिखाई देता है"", + ""public"": ""सभी के लिए सार्वजनिक"", + ""disabled"": ""सार्वजनिक मेमो अक्षम किए गए हैं"" + }, + ""delete-memo"": ""मेमो हटाएँ"", + ""delete-confirm"": ""क्या आप इस मेमो को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"" }, - ""storage-section"": { - ""current-storage"": ""वर्तमान ऑब्जेक्ट स्टोरेज"", - ""type-database"": ""डेटाबेस"", - ""type-local"": ""स्थानीय"", - ""storage-services-list"": ""स्टोरेज सेवा सूची"", - ""create-a-service"": ""सेवा बनाएँ"", - ""update-a-service"": ""सेवा अपडेट करें"", - ""warning-text"": ""क्या आप स्टोरेज सेवा \""{{name}}\"" को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""delete-storage"": ""संग्रहण हटाएँ"", - ""local-storage-path"": ""स्थानीय संग्रहण मार्ग"", - ""update-local-path"": ""स्थानीय संग्रहण मार्ग अपडेट करें"", - ""update-local-path-description"": ""स्थानीय संग्रहण मार्ग एक अपने डेटाबेस फ़ाइल के प्रति संबंधित मार्ग है"", - ""create-storage"": ""संग्रहण बनाएँ"", - ""update-storage"": ""संग्रहण अपडेट करें"", - ""update-storage-id"": ""वर्तमान संग्रहण"", - ""service-name"": ""सेवा नाम"", - ""storage-id"": ""संग्रहण आईडी"", - ""storage-endpoint"": ""संग्रहण अंतःस्थान"", - ""access-key-id"": ""पहुँच कुंजी आईडी"", - ""secret-access-key"": ""गुप्त पहुँच कुंजी"", - ""bucket-name"": ""बकेट का नाम"", - ""region"": ""क्षेत्र"", - ""region-placeholder"": ""जैसे: ap-northeast-1"", - ""base-url"": ""बेस यूआरएल"", - ""base-url-placeholder"": ""https://example.com"", - ""sync-period"": ""सिंक अवधि"", - ""sync-period-placeholder"": ""डेटा सिंक्रनाइज़ करने की अवधि इस बिंदु पर है"", - ""google-service-account"": ""Google सेवा खाता"", - ""dropbox-oauth-token"": ""Dropbox OAuth टोकन"", - ""api-key"": ""एपीआई कुंजी"", - ""enable-private-resource"": ""निजी संसाधन सक्षम करें"", - ""enable-auto-sync"": ""ऑटो सिंक सक्षम करें"", - ""auto-sync-offset"": ""ऑटो सिंक ऑफ़सेट"", - ""auto-sync-offset-placeholder"": ""ऑटो सिंक ऑफ़सेट इस बिंदु पर है"", - ""warning-sync-now"": ""क्या आप सभी संग्रहण अभी सिंक करना चाहते हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""sync-now"": ""अब सिंक करें"", - ""need-sync"": ""सिंक की जरूरत है"" + ""resource"": { + ""no-resources"": ""कोई संसाधन नहीं।"", + ""fetching-data"": ""डेटा लाया जा रहा है..."", + ""copy-link"": ""लिंक कॉपी करें"", + ""reset-link"": ""लिंक रीसेट करें"", + ""reset-resource-link"": ""संसाधन लिंक रीसेट करें"", + ""reset-link-prompt"": ""क्या आप लिंक को रीसेट करने के लिए सुनिश्चित हैं?\nयह सभी वर्तमान लिंक उपयोगों को बिगाड़ देगा।\n\nयह कार्रवाई अप्रत्याशित है।❗"", + ""delete-resource"": ""संसाधन हटाएँ"", + ""linked-amount"": ""लिंक की गई राशि"", + ""warning-text"": ""क्या आप इस संसाधन को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", + ""warning-text-unused"": ""क्या आप इन अपयुक्त संसाधनों को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", + ""no-unused-resources"": ""कोई अपयुक्त संसाधन नहीं हैं"", + ""delete-selected-resources"": ""चयनित संसाधनों को हटाएँ"", + ""no-files-selected"": ""कोई फ़ाइलें चयनित नहीं हैं❗"", + ""upload-successfully"": ""सफलतापूर्वक अपलोड किया गया"", + ""file-drag-drop-prompt"": ""फ़ाइल अपलोड करने के लिए अपनी फ़ाइल यहां खींचें और छोड़ें"", + ""search-bar-placeholder"": ""संसाधन खोजें"", + ""clear"": ""साफ़ करें"", + ""create-dialog"": { + ""title"": ""संसाधन बनाएँ"", + ""upload-method"": ""अपलोड विधि"", + ""local-file"": { + ""option"": ""स्थानीय फ़ाइल"", + ""choose"": ""फ़ाइल चुनें..."" + }, + ""external-link"": { + ""option"": ""बाह्य लिंक"", + ""link"": ""लिंक"", + ""link-placeholder"": ""https://the.link.to/your/resource"", + ""file-name"": ""फ़ाइल का नाम"", + ""file-name-placeholder"": ""फ़ाइल का नाम"", + ""type"": ""प्रकार"", + ""type-placeholder"": ""फ़ाइल प्रकार"" + } + } }, - ""member-section"": { - ""create-member"": ""सदस्य बनाएँ"", - ""update-member"": ""सदस्य अपडेट करें"", - ""warning-text"": ""क्या आप सदस्य \""{{name}}\"" को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""delete-member"": ""सदस्य हटाएँ"", - ""member-list"": ""सदस्य सूची"", - ""invite-info"": ""आमंत्रण जानकारी"", - ""invited-members"": ""निमंत्रित सदस्य"", - ""invited-members-list"": ""निमंत्रित सदस्य सूची"", - ""member-role"": ""सदस्य भूमिका"", - ""invited-email"": ""आमंत्रित ईमेल"", - ""invited-role"": ""आमंत्रित भूमिका"", - ""send-invitation"": ""निमंत्रण भेजें"", - ""send-invitation-info"": ""सदस्य को निमंत्रण भेजने के लिए आईडी और भूमिका आवश्यक होगी।"", - ""invitation-email-placeholder"": ""नए सदस्य का ईमेल दर्ज करें"", - ""delete-member-invitation"": ""सदस्य निमंत्रण हटाएँ"", - ""delete-invitation-text"": ""क्या आप सदस्य \""{{email}}\"" के निमंत्रण को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"" + ""tag-list"": { + ""tip-text"": ""बनाने के लिए `#tag` इनपुट करें"", + ""create-tag"": ""टैग बनाएँ"", + ""all-tags"": ""सभी टैग"", + ""tag-name"": ""टैग_नाम"" }, - ""system-section"": { - ""deploy-static"": ""स्थिर वेबसाइट तैयार करें"", - ""deploy-system-warning"": ""क्या आप सिस्टम को तैयार करने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""system-deployed"": ""सिस्टम तैयार हो गया है"", - ""system-deployed-info"": ""इसे अब जितने बार चाहें उतने बार तैयार किया जा सकता है।"", - ""reset-system-warning"": ""क्या आप सभी डेटा को सिस्टम रीसेट करने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""reset-system"": ""सिस्टम रीसेट करें"", - ""system-reset"": ""सिस्टम रीसेट किया गया"", - ""system-reset-info"": ""सभी डेटा साफ हो गया है।"", - ""manual-upgrade"": ""मैनुअल अपग्रेड"", - ""manual-upgrade-info"": ""कृपया अपने वेबसाइट और सर्वर को बूट से पुनः तैयार करें।"", - ""latest-version"": ""नवीनतम संस्करण"", - ""check-version"": ""संस्करण की जांच करें"", - ""checked-version"": ""संस्करण की जांच की गई"", - ""upgrade-system"": ""सिस्टम अपग्रेड करें"", - ""upgrade-system-warning"": ""क्या आप सिस्टम को अपग्रेड करने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""system-upgrade"": ""सिस्टम अपग्रेड किया गया है"", - ""system-upgrade-info"": ""सिस्टम अपग्रेड हो गया है।"" + ""daily-review"": { + ""title"": ""दैनिक समीक्षा"", + ""no-memos"": ""उफ़, कुछ भी नहीं है।"" }, - ""openai-section"": { - ""show-as-bot"": ""बॉट के रूप में प्रदर्शित करें"", - ""toggle-as-bot-warning"": ""क्या आप बॉट के रूप में प्रदर्शित करने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""toggle-as-bot"": ""बॉट के रूप में प्रदर्शित हो रहा है"", - ""toggle-as-bot-info"": ""बॉट के रूप में प्रदर्शित हो गया है।"", - ""disconnect-from-openai"": ""OpenAI से डिस्कनेक्ट करें"", - ""openai-disconnect-warning"": ""क्या आप OpenAI से डिस्कनेक्ट करने के लिए सुनिश्चित हैं?\n\nडिस्कनेक्ट करने के बाद बॉट जानकारी प्राप्त नहीं कर सकता है।\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""openai-disconnected"": ""OpenAI से डिस्कनेक्ट हो गया"", - ""openai-disconnected-info"": ""बॉट अब OpenAI से डिस्कनेक्ट हो गया है।"", - ""reset-openai"": ""OpenAI रीसेट करें"", - ""openai-reset-warning"": ""क्या आप OpenAI को रीसेट करने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""openai-reset"": ""OpenAI को रीसेट करें"", - ""openai-reset-info"": ""OpenAI रीसेट कर दिया गया है।"" + ""setting"": { + ""my-account"": ""मेरा खाता"", + ""preference"": ""प्राथमिकता"", + ""member"": ""सदस्य"", + ""member-list"": ""सदस्य सूची"", + ""system"": ""सिस्टम"", + ""storage"": ""संग्रहण"", + ""sso"": ""एसएसओ"", + ""account-section"": { + ""title"": ""खाता जानकारी"", + ""username-note"": ""साइन इन करने के लिए उपयोग किया जाता है"", + ""nickname-note"": ""बैनर में प्रदर्शित किया जाता है"", + ""email-note"": ""वैकल्पिक"", + ""update-information"": ""जानकारी अपडेट करें"", + ""change-password"": ""पासवर्ड बदलें"", + ""reset-api"": ""API रीसेट करें"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""OpenAPI कुंजी रीसेट करें"", + ""openapi-reset-warning"": ""❗ मौजूदा API अमान्य हो जाएगा और एक नया जेनरेट होगा।\n\nक्या आप नया जेनरेट करना चाहते हैं?"", + ""openapi-sample-post"": ""नमस्ते #memos से {{url}}"" + }, + ""preference-section"": { + ""theme"": ""थीम"", + ""default-memo-visibility"": ""डिफ़ॉल्ट मेमो दृश्यता"", + ""default-resource-visibility"": ""डिफ़ॉल्ट संसाधन दृश्यता"", + ""enable-folding-memo"": ""मेमो फोल्ड करने की सक्षमता"", + ""enable-double-click"": ""दोहरी क्लिक संपादित करने की सक्षमता"", + ""editor-font-style"": ""संपादक फ़ॉन्ट शैली"", + ""mobile-editor-style"": ""मोबाइल संपादक शैली"", + ""default-memo-sort-option"": ""मेमो प्रदर्शन समय"", + ""telegram-user-id"": ""टेलीग्राम उपयोगकर्ता आईडी"", + ""telegram-user-id-placeholder"": ""अपने टेलीग्राम बॉट को कोई शब्द भेजें और प्राप्त करें"", + ""created_ts"": ""समय बनाया गया"", + ""updated_ts"": ""समय अद्यतन किया गया"", + ""daily-review-time-offset"": ""दैनिक समीक्षा समय ऑफ़सेट"", + ""auto-collapse"": ""ऑटो संक्षेपित"" + }, + ""storage-section"": { + ""current-storage"": ""वर्तमान ऑब्जेक्ट स्टोरेज"", + ""type-database"": ""डेटाबेस"", + ""type-local"": ""स्थानीय"", + ""storage-services-list"": ""स्टोरेज सेवा सूची"", + ""create-a-service"": ""सेवा बनाएँ"", + ""update-a-service"": ""सेवा अपडेट करें"", + ""warning-text"": ""क्या आप स्टोरेज सेवा \""{{name}}\"" को हटाने के लिए सुनिश्चित हैं?\n\nयह कार्रवाई अप्रत्याशित है।❗"", + ""delete-storage"": ""संग्रहण हटाएँ"", + ""local-storage-path"": ""स्थानीय संग्रहण मार्ग"", + ""update-local-path"": ""स्थानीय संग्रहण मार्ग अपडेट करें"", + ""update-local-path-description"": ""स्थानीय संग्रहण मार्ग एक अपने डेटाबेस फ़ाइल के प्रति संबंधित मार्ग है"", + ""create-storage"": ""संग्रहण बनाएँ"", + ""update-storage"": ""संग्रहण अपडेट करें"", + ""region"": ""क्षेत्र"", + ""region-placeholder"": ""जैसे: ap-northeast-1"" + }, + ""member-section"": { + ""delete-member"": ""सदस्य हटाएँ"" + } }, - ""sso-section"": { - ""single-sign-on"": ""सिंगल साइन ऑन (SSO)"", - ""sso-info"": ""सिंगल साइन ऑन (SSO) सेटिंग को अक्षम करने से आपके सभी उपयोगकर्ताओं के लिए लॉग इन रद्द कर दिया जाएगा।"", - ""enable-sso"": ""सिंगल साइन ऑन (SSO) सक्षम करें"", - ""sso-enabled"": ""सिंगल साइन ऑन (SSO) सक्षम हो गया"", - ""sso-enabled-info"": ""सिंगल साइन ऑन (SSO) सक्षम कर दिया गया है।"", - ""sso-disable-warning"": ""क्या आप सिंगल साइन ऑन (SSO) को अक्षम करने के लिए सुनिश्चित हैं?\n\nडिसेबल करने के बाद सिंगल साइन ऑन (SSO) सेटिंग्स चोटी से अक्षम हो जाएगा और सभी उपयोगकर्ताएँ नियंत्रण पर आएगी।\n\nयह कार्रवाई अप्रत्याशित है।❗"", - ""disable-sso"": ""सिंगल साइन ऑन (SSO) अक्षम करें"", - ""sso-disabled"": ""सिंगल साइन ऑन (SSO) अक्षम हो गया"", - ""sso-disabled-info"": ""सिंगल साइन ऑन (SSO) अक्षम कर दिया गया है।"" - } - }, - ""filter"": { - ""new-filter"": ""नया फ़िल्टर"", - ""type"": { - ""tag"": ""टैग"", - ""type"": ""प्रकार"", - ""text"": ""पाठ"", - ""display-time"": ""प्रदर्शन समय"", - ""visibility"": ""दृश्यता"" + ""amount-text"": { + ""memo_one"": ""मेमो"", + ""memo_other"": ""मेमोस"" + }, + ""message"": { + ""no-data"": ""शायद कोई डेटा नहीं मिला, शायद यह किसी अन्य विकल्प हो सकता है।"", + ""memos-ready"": ""सभी मेमो तैयार हैं 🎉"", + ""resource-ready"": ""सभी संसाधन तैयार हैं 🎉"", + ""restored-successfully"": ""सफलतापूर्वक पुनर्स्थापित किया गया"", + ""memo-updated-datetime"": ""मेमो बनाने की तिथि बदल गई है।"", + ""invalid-created-datetime"": ""अमान्य बनाई गई तिथि।"", + ""change-memo-created-time"": ""मेमो बनाने का समय बदलें"", + ""change-memo-created-time-warning-1"": ""यह एक सामान्य व्यवहार नहीं है।"", + ""change-memo-created-time-warning-2"": ""कृपया यह सुनिश्चित करें कि आपको वास्तव में इसकी जरूरत है।"", + ""memo-not-found"": ""मेमो नहीं मिला।"", + ""fill-all"": ""कृपया सभी फ़ील्ड भरें।"", + ""password-not-match"": ""पासवर्ड मेल नहीं खाते।"", + ""new-password-not-match"": ""नए पासवर्ड मेल नहीं खाते।"", + ""image-load-failed"": ""तस्वीर लोड विफल हुआ"", + ""fill-form"": ""कृपया इस फ़ॉर्म को भरें"", + ""fill-server-name"": ""कृपया सर्वर का नाम भरें"", + ""login-failed"": ""लॉगिन विफल हुआ"", + ""signup-failed"": ""साइनअप विफल हुआ"", + ""user-not-found"": ""उपयोगकर्ता नहीं मिला"", + ""password-changed"": ""पासवर्ड बदल दिया गया"", + ""private-only"": ""यह मेमो केवल निजी है।"", + ""copied"": ""कॉपी किया गया"", + ""succeed-copy-content"": ""सामग्री सफलतापूर्वक कॉपी की गई।"", + ""succeed-copy-code"": ""कोड सफलतापूर्वक कॉपी किया गया।"", + ""succeed-copy-link"": ""लिंक सफलतापूर्वक कॉपी किया गया।"", + ""change-resource-filename"": ""संसाधन फ़ाइल का नाम बदलें"", + ""resource-filename-updated"": ""संसाधन फ़ाइल का नाम बदल गया है।"", + ""invalid-resource-filename"": ""अमान्य फ़ाइल का नाम।"", + ""click-to-save-the-image"": ""तस्वीर सहेजने के लिए क्लिक करें"", + ""generating-the-screenshot"": ""स्क्रीनशॉट बनाया जा रहा है..."", + ""count-selected-resources"": ""कुल चयनित"", + ""succeed-vacuum-database"": ""डेटाबेस को सफलतापूर्वक वैक्यूम कर दिया गया"", + ""succeed-update-additional-style"": ""अतिरिक्त शैली सफलतापूर्वक अपडेट की गई।"", + ""succeed-copy-resource-link"": ""संसाधन लिंक सफलतापूर्वक कॉपी किया गया।"", + ""succeed-update-customized-profile"": ""प्रोफ़ाइल सफलतापूर्वक कस्टमाइज़ किया गया।"", + ""succeed-update-additional-script"": ""अतिरिक्त स्क्रिप्ट सफलतापूर्वक अपडेट की गई।"", + ""update-succeed"": ""अपडेट सफल हुआ"", + ""page-not-found"": ""404 - पेज नहीं मिला 😥"", + ""maximum-upload-size-is"": ""अधिकतम अपलोड साइज {{size}} MiB है"", + ""file-exceeds-upload-limit-of"": ""फ़ाइल {{file}} अपलोड सीमा {{size}} MiB की पार कर गई है"" }, - ""operator"": { - ""contains"": ""में है"", - ""not-contains"": ""में नहीं है"", - ""is"": ""बराबर है"", - ""is-not"": ""बराबर नहीं है"", - ""before"": ""से पहले"", - ""after"": ""के बाद"" + ""days"": { + ""mon"": ""सोमवार"", + ""tue"": ""मंगलवार"", + ""wed"": ""बुधवार"", + ""thu"": ""गुरुवार"", + ""fri"": ""शुक्रवार"", + ""sat"": ""शनिवार"", + ""sun"": ""रविवार"" }, - ""value"": { - ""not-tagged"": ""कोई टैग नहीं"", - ""linked"": ""लिंक्ड है"", - ""has-attachment"": ""अटैचमेंट है"" + ""embed-memo"": { + ""title"": ""मेमो एम्बेड करें"", + ""text"": ""नीचे दिए गए कोड को अपने ब्लॉग या वेबसाइट में कॉपी और पेस्ट करें।"", + ""only-public-supported"": ""* केवल सार्वजनिक मेमो एम्बेड किए जा सकते हैं।"", + ""copy"": ""कॉपी करें"" }, - ""text-placeholder"": ""^ से शुरू करने के लिए रेगेक्स उपयोग करें"", - ""and"": ""और"", - ""or"": ""या"" - }, - ""amount-text"": { - ""memo_one"": ""मेमो"", - ""memo_other"": ""मेमोस"", - ""tag_one"": ""टैग"", - ""tag_other"": ""टैग्स"", - ""day_one"": ""दिन"", - ""day_other"": ""दिनें"" - }, - ""message"": { - ""no-data"": ""शायद कोई डेटा नहीं मिला, शायद यह किसी अन्य विकल्प हो सकता है।"", - ""memos-ready"": ""सभी मेमो तैयार हैं 🎉"", - ""resource-ready"": ""सभी संसाधन तैयार हैं 🎉"", - ""restored-successfully"": ""सफलतापूर्वक पुनर्स्थापित किया गया"", - ""memo-updated-datetime"": ""मेमो बनाने की तिथि बदल गई है।"", - ""invalid-created-datetime"": ""अमान्य बनाई गई तिथि।"", - ""change-memo-created-time"": ""मेमो बनाने का समय बदलें"", - ""change-memo-created-time-warning-1"": ""यह एक सामान्य व्यवहार नहीं है।"", - ""change-memo-created-time-warning-2"": ""कृपया यह सुनिश्चित करें कि आपको वास्तव में इसकी जरूरत है।"", - ""memo-not-found"": ""मेमो नहीं मिला।"", - ""fill-all"": ""कृपया सभी फ़ील्ड भरें।"", - ""password-not-match"": ""पासवर्ड मेल नहीं खाते।"", - ""new-password-not-match"": ""नए पासवर्ड मेल नहीं खाते।"", - ""image-load-failed"": ""तस्वीर लोड विफल हुआ"", - ""fill-form"": ""कृपया इस फ़ॉर्म को भरें"", - ""fill-server-name"": ""कृपया सर्वर का नाम भरें"", - ""login-failed"": ""लॉगिन विफल हुआ"", - ""signup-failed"": ""साइनअप विफल हुआ"", - ""user-not-found"": ""उपयोगकर्ता नहीं मिला"", - ""password-changed"": ""पासवर्ड बदल दिया गया"", - ""private-only"": ""यह मेमो केवल निजी है।"", - ""copied"": ""कॉपी किया गया"", - ""succeed-copy-content"": ""सामग्री सफलतापूर्वक कॉपी की गई।"", - ""succeed-copy-code"": ""कोड सफलतापूर्वक कॉपी किया गया।"", - ""succeed-copy-link"": ""लिंक सफलतापूर्वक कॉपी किया गया।"", - ""change-resource-filename"": ""संसाधन फ़ाइल का नाम बदलें"", - ""resource-filename-updated"": ""संसाधन फ़ाइल का नाम बदल गया है।"", - ""invalid-resource-filename"": ""अमान्य फ़ाइल का नाम।"", - ""click-to-save-the-image"": ""तस्वीर सहेजने के लिए क्लिक करें"", - ""generating-the-screenshot"": ""स्क्रीनशॉट बनाया जा रहा है..."", - ""count-selected-resources"": ""कुल चयनित"", - ""too-short"": ""बहुत कम"", - ""too-long"": ""बहुत लंबा"", - ""not-allow-space"": ""अनुमति नहीं है अंतरिक्ष"", - ""not-allow-chinese"": ""चीनी की अनुमति नहीं है"", - ""succeed-vacuum-database"": ""डेटाबेस को सफलतापूर्वक वैक्यूम कर दिया गया"", - ""succeed-update-additional-style"": ""अतिरिक्त शैली सफलतापूर्वक अपडेट की गई।"", - ""succeed-copy-resource-link"": ""संसाधन लिंक सफलतापूर्वक कॉपी किया गया।"", - ""succeed-update-customized-profile"": ""प्रोफ़ाइल सफलतापूर्वक कस्टमाइज़ किया गया।"", - ""succeed-update-additional-script"": ""अतिरिक्त स्क्रिप्ट सफलतापूर्वक अपडेट की गई।"", - ""update-succeed"": ""अपडेट सफल हुआ"", - ""page-not-found"": ""404 - पेज नहीं मिला 😥"", - ""maximum-upload-size-is"": ""अधिकतम अपलोड साइज {{size}} MiB है"", - ""file-exceeds-upload-limit-of"": ""फ़ाइल {{file}} अपलोड सीमा {{size}} MiB की पार कर गई है"" - }, - ""days"": { - ""mon"": ""सोमवार"", - ""tue"": ""मंगलवार"", - ""wed"": ""बुधवार"", - ""thu"": ""गुरुवार"", - ""fri"": ""शुक्रवार"", - ""sat"": ""शनिवार"", - ""sun"": ""रविवार"" - }, - ""embed-memo"": { - ""title"": ""मेमो एम्बेड करें"", - ""text"": ""नीचे दिए गए कोड को अपने ब्लॉग या वेबसाइट में कॉपी और पेस्ट करें।"", - ""only-public-supported"": ""* केवल सार्वजनिक मेमो एम्बेड किए जा सकते हैं।"", - ""copy"": ""कॉपी करें"" - }, - ""heatmap"": { - ""memo-in"": ""{{period}} में मेमो"", - ""memos-in"": ""{{period}} में मेमोस"", - ""memo-on"": ""{{date}} को {{amount}} मेमो"", - ""memos-on"": ""{{date}} को {{amount}} मेमोस"", - ""day"": ""दिन"", - ""days"": ""दिनें"" - }, - ""about"": { - ""about-memos"": ""मेमोस के बारे में"", - ""memos-description"": ""मेमोस एक वेब-आधारित नोट-लेखन एप्लिकेशन है जिसका उपयोग आप नोट लिखने, व्यवस्थित करने और साझा करने के लिए कर सकते हैं।"", - ""no-server-description"": ""इस सर्वर के लिए कोई विवरण निर्धारित नहीं किया गया है।"", - ""powered-by"": ""द्वारा संचालित"", - ""other-projects"": ""अन्य प्रोजेक्ट्स"" - } + ""heatmap"": { + ""memo-in"": ""{{period}} में मेमो"", + ""memos-in"": ""{{period}} में मेमोस"", + ""memo-on"": ""{{date}} को {{amount}} मेमो"", + ""memos-on"": ""{{date}} को {{amount}} मेमोस"", + ""day"": ""दिन"", + ""days"": ""दिनें"" + }, + ""about"": { + ""about-memos"": ""मेमोस के बारे में"", + ""memos-description"": ""मेमोस एक वेब-आधारित नोट-लेखन एप्लिकेशन है जिसका उपयोग आप नोट लिखने, व्यवस्थित करने और साझा करने के लिए कर सकते हैं।"", + ""no-server-description"": ""इस सर्वर के लिए कोई विवरण निर्धारित नहीं किया गया है।"", + ""powered-by"": ""द्वारा संचालित"", + ""other-projects"": ""अन्य प्रोजेक्ट्स"" + } } diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json index d16341223b95b..09012ac42d9f5 100644 --- a/web/src/locales/hr.json +++ b/web/src/locales/hr.json @@ -1,402 +1,342 @@ { - ""common"": { - ""memos-slogan"": ""Perolaki memo hub. Otvorenog kôda i besplatno zauvijek."", - ""about"": ""O aplikaciji"", - ""home"": ""Glavna"", - ""resources"": ""Privitci"", - ""settings"": ""Postavke"", - ""archived"": ""Arhivirano"", - ""email"": ""Email"", - ""password"": ""Lozinka"", - ""avatar"": ""Avatar"", - ""username"": ""Korisničko ime"", - ""nickname"": ""Nadimak"", - ""save"": ""Sačuvaj"", - ""close"": ""Zatvori"", - ""cancel"": ""Otkaži"", - ""create"": ""Stvori"", - ""update"": ""Obnovi"", - ""change"": ""Promijeni"", - ""confirm"": ""Potvrdi"", - ""reset"": ""Resetiraj"", - ""language"": ""Jezik"", - ""version"": ""Verzija"", - ""pin"": ""Pinaj"", - ""unpin"": ""Makni pin"", - ""edit"": ""Uredi"", - ""restore"": ""Vrati"", - ""delete"": ""Obriši"", - ""null"": ""Ništa"", - ""share"": ""Podijeli"", - ""archive"": ""Arhiviraj"", - ""basic"": ""Osnovno"", - ""admin"": ""Admin"", - ""explore"": ""Istraži"", - ""sign-in"": ""Prijavi se"", - ""sign-in-with"": ""Ulogiraj se sa {{provider}}"", - ""or"": ""ili"", - ""sign-up"": ""Registriraj se"", - ""sign-out"": ""Odjavi se"", - ""type"": ""Tip"", - ""title"": ""Naslov"", - ""filter"": ""Filtriraj"", - ""filter-period"": ""{{from}} do {{to}}"", - ""tags"": ""Tagovi"", - ""yourself"": ""Ti"", - ""changed"": ""promijenjeno"", - ""fold"": ""Skupi"", - ""expand"": ""Proširi"", - ""image"": ""Slika"", - ""link"": ""Link"", - ""vacuum"": ""Vakuumiraj"", - ""select"": ""Odaberi"", - ""database"": ""Baza podataka"", - ""upload"": ""Prenesi"", - ""preview"": ""Pregled"", - ""rename"": ""Preimenuj"", - ""clear"": ""Očisti"", - ""name"": ""Ime"", - ""visibility"": ""Vidljivost"", - ""learn-more"": ""Nauči više"", - ""e.g"": ""e.g."", - ""beta"": ""Beta"", - ""dialog"": { - ""error"": ""Greška"", - ""help"": ""Pomoć"", - ""info"": ""Informacija"", - ""success"": ""Uspjeh"", - ""warning"": ""Upozorenje"" + ""common"": { + ""about"": ""O aplikaciji"", + ""home"": ""Glavna"", + ""resources"": ""Privitci"", + ""settings"": ""Postavke"", + ""archived"": ""Arhivirano"", + ""email"": ""Email"", + ""password"": ""Lozinka"", + ""avatar"": ""Avatar"", + ""username"": ""Korisničko ime"", + ""nickname"": ""Nadimak"", + ""save"": ""Sačuvaj"", + ""close"": ""Zatvori"", + ""cancel"": ""Otkaži"", + ""create"": ""Stvori"", + ""update"": ""Obnovi"", + ""change"": ""Promijeni"", + ""confirm"": ""Potvrdi"", + ""reset"": ""Resetiraj"", + ""language"": ""Jezik"", + ""version"": ""Verzija"", + ""pin"": ""Pinaj"", + ""unpin"": ""Makni pin"", + ""edit"": ""Uredi"", + ""restore"": ""Vrati"", + ""delete"": ""Obriši"", + ""null"": ""Ništa"", + ""share"": ""Podijeli"", + ""archive"": ""Arhiviraj"", + ""basic"": ""Osnovno"", + ""admin"": ""Admin"", + ""explore"": ""Istraži"", + ""sign-in"": ""Prijavi se"", + ""sign-in-with"": ""Ulogiraj se sa {{provider}}"", + ""or"": ""ili"", + ""sign-up"": ""Registriraj se"", + ""sign-out"": ""Odjavi se"", + ""type"": ""Tip"", + ""title"": ""Naslov"", + ""filter"": ""Filtriraj"", + ""filter-period"": ""{{from}} do {{to}}"", + ""tags"": ""Tagovi"", + ""yourself"": ""Ti"", + ""changed"": ""promijenjeno"", + ""fold"": ""Skupi"", + ""expand"": ""Proširi"", + ""image"": ""Slika"", + ""link"": ""Link"", + ""vacuum"": ""Vakuumiraj"", + ""select"": ""Odaberi"", + ""database"": ""Baza podataka"", + ""upload"": ""Prenesi"", + ""preview"": ""Pregled"", + ""rename"": ""Preimenuj"", + ""clear"": ""Očisti"", + ""name"": ""Ime"", + ""visibility"": ""Vidljivost"", + ""learn-more"": ""Nauči više"", + ""beta"": ""Beta"", + ""mark"": ""Mark"" }, - ""mark"": ""Mark"" - }, - ""router"": { - ""back-to-home"": ""Natrag kući"" - }, - ""auth"": { - ""signup-as-host"": ""Registriraj se kao Vlasnik"", - ""host-tip"": ""Registriraš se kao Vlasnik sajta."", - ""not-host-tip"": ""Ako nemaš račun, kontaktiraj vlasnika stranice."", - ""new-password"": ""Nova lozinka"", - ""repeat-new-password"": ""Ponovi novu lozinku"" - }, - ""editor"": { - ""editing"": ""Uređivanje..."", - ""cancel-edit"": ""Otkaži uređivanje"", - ""save"": ""Sačuvaj"", - ""placeholder"": ""Piši... piši mi..."", - ""only-image-supported"": ""Samo slike su podržane."", - ""cant-empty"": ""Sadržaj ne može biti prazan"", - ""local"": ""Lokalno"", - ""resources"": ""Resursi"" - }, - ""memo"": { - ""view-detail"": ""Vidi detalje"", - ""copy-link"": ""Kopiraj Link"", - ""embed"": ""Ugradi"", - ""archived-memos"": ""Arhivirani Memoi"", - ""no-archived-memos"": ""Nema arhiviranih memoa."", - ""fetching-data"": ""dohvaćam podatke..."", - ""fetch-more"": ""Klikni ovdje da učitaš više"", - ""archived-at"": ""Arhivirano u"", - ""search-placeholder"": ""Pretraži memoe"", - ""visibility"": { - ""private"": ""Privatno"", - ""protected"": ""Vidljivo članovima"", - ""public"": ""Javno"", - ""disabled"": ""Javni memoi su onemogućeni"" + ""auth"": { + ""host-tip"": ""Registriraš se kao Vlasnik sajta."", + ""new-password"": ""Nova lozinka"", + ""repeat-new-password"": ""Ponovi novu lozinku"" }, - ""delete-memo"": ""Obriši Memo"", - ""delete-confirm"": ""Jesi li siguran?\n\nOVA AKCIJA JE NEPOVRATNA❗"" - }, - ""resource"": { - ""no-resources"": ""Nema resursa."", - ""fetching-data"": ""dohvaćanje podataka..."", - ""copy-link"": ""Kopiraj link"", - ""reset-link"": ""Resetiraj link"", - ""reset-resource-link"": ""Resetiraj Resource link"", - ""reset-link-prompt"": ""Želiš li sigurno resetirati link?\nOvo će break sve trenutne link usages.\n\nTHIS ACTION IS IRREVERSIBLE❗"", - ""delete-resource"": ""Obriši Resource"", - ""linked-amount"": ""Linked amount"", - ""warning-text"": ""Želiš li sigurno izbrisati ovaj resource?\n\nOVO JE NEPOVRATNA AKCIJA❗"", - ""warning-text-unused"": ""Are you sure to delete these unused resources?\n\nOVO JE NEPOVRATNA AKCIJA❗"", - ""no-unused-resources"": ""Nema neiskorištenih resources"", - ""delete-selected-resources"": ""Delete Selected Resources"", - ""no-files-selected"": ""Nema odabranih fajlova❗"", - ""upload-successfully"": ""Upload je uspješan"", - ""file-drag-drop-prompt"": ""Povuci i potegni svoj fajl ovdje kako bi bio prenesen"", - ""search-bar-placeholder"": ""Nađi privitke"", - ""clear"": ""Clear"", - ""create-dialog"": { - ""title"": ""Stvori Resource"", - ""upload-method"": ""Upload metoda"", - ""local-file"": { - ""option"": ""Lokalni fajl"", - ""choose"": ""Odaberi fajl..."" - }, - ""external-link"": { - ""option"": ""Vanjski link"", - ""link"": ""Link"", - ""link-placeholder"": ""https://link.do/tvog/resursa"", - ""file-name"": ""Ime fajla"", - ""file-name-placeholder"": ""Ime fajla"", - ""type"": ""Tip"", - ""type-placeholder"": ""Tip fajla"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""Unesi `#tag` kako bi stvorio"", - ""create-tag"": ""Stvori Tag"", - ""all-tags"": ""Svi Tagovi"", - ""tag-name"": ""IME_TAGA"" - }, - ""daily-review"": { - ""title"": ""Pregled dana"", - ""no-memos"": ""Ups. Ovdje nema ničega."" - }, - ""setting"": { - ""my-account"": ""Moj račun"", - ""preference"": ""Postavke"", - ""member"": ""Član"", - ""member-list"": ""Lista članova"", - ""system"": ""Sustav"", - ""storage"": ""Skladište"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""Informacije o računu"", - ""username-note"": ""Koristi se za prijavu"", - ""nickname-note"": ""Prikazano u baneru"", - ""email-note"": ""Po izboru/Neobavezno"", - ""update-information"": ""Ažuriraj Informacije"", - ""change-password"": ""Promijeni lozinku"", - ""reset-api"": ""Resetiraj API"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""Resetiraj OpenAPI Ključ"", - ""openapi-reset-warning"": ""❗ Postojeći API će odsada biti nevaljan i bit će generiran novi.\n\nJesi li siguran da želiš resetirati?"", - ""openapi-sample-post"": ""Zdravo #memos od {{url}}"" + ""editor"": { + ""editing"": ""Uređivanje..."", + ""cancel-edit"": ""Otkaži uređivanje"", + ""save"": ""Sačuvaj"", + ""placeholder"": ""Piši... piši mi..."", + ""only-image-supported"": ""Samo slike su podržane."", + ""cant-empty"": ""Sadržaj ne može biti prazan"", + ""local"": ""Lokalno"", + ""resources"": ""Resursi"" }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Zadana vidljivost memoa"", - ""default-resource-visibility"": ""Zadana resource vidljivost"", - ""enable-folding-memo"": ""Omogući folding memo"", - ""enable-double-click"": ""Omogući uređivanje duplim klikom"", - ""editor-font-style"": ""Editor font stil"", - ""mobile-editor-style"": ""Mobile editor stil"", - ""default-memo-sort-option"": ""Memo display vrijeme"", - ""telegram-user-id"": ""Telegram UserID"", - ""telegram-user-id-placeholder"": ""Send any words to Your Telegram Bot to get"", - ""created_ts"": ""Vrijeme stvaranja"", - ""updated_ts"": ""Vrijeme ažuriranja"", - ""daily-review-time-offset"": ""Daily Review Time Offset"", - ""auto-collapse"": ""Auto Collapse"" + ""memo"": { + ""view-detail"": ""Vidi detalje"", + ""copy-link"": ""Kopiraj Link"", + ""embed"": ""Ugradi"", + ""archived-memos"": ""Arhivirani Memoi"", + ""no-archived-memos"": ""Nema arhiviranih memoa."", + ""fetching-data"": ""dohvaćam podatke..."", + ""fetch-more"": ""Klikni ovdje da učitaš više"", + ""archived-at"": ""Arhivirano u"", + ""search-placeholder"": ""Pretraži memoe"", + ""visibility"": { + ""private"": ""Privatno"", + ""protected"": ""Vidljivo članovima"", + ""public"": ""Javno"", + ""disabled"": ""Javni memoi su onemogućeni"" + }, + ""delete-memo"": ""Obriši Memo"", + ""delete-confirm"": ""Jesi li siguran?\n\nOVA AKCIJA JE NEPOVRATNA❗"" }, - ""storage-section"": { - ""current-storage"": ""Trenutno skladište objekata"", - ""type-database"": ""Databaza"", - ""type-local"": ""Local"", - ""storage-services-list"": ""Storage service list"", - ""create-a-service"": ""Stvori service"", - ""update-a-service"": ""Ažuriraj service"", - ""warning-text"": ""Jesi li siguran da želiš obrisati storage service \""{{name}}\""?\n\nOVA AKCIJA JE NEPOVRATNA❗"", - ""delete-storage"": ""Obriši Skladište"", - ""local-storage-path"": ""Local storage path"", - ""update-local-path"": ""Ažuriraj Local Storage Path"", - ""update-local-path-description"": ""Local storage path je relativna putanja do fajla tvoje baze podataka"", - ""create-storage"": ""Stvori Storage"", - ""update-storage"": ""Ažuriraj Storage"", - ""endpoint"": ""Endpoint"", - ""s3-compatible-url"": ""S3 kompatibilan URL"", - ""region"": ""Regija"", - ""region-placeholder"": ""Ime regije"", - ""accesskey"": ""Pristupni ključ"", - ""accesskey-placeholder"": ""Pristupni ključ / Access ID"", - ""secretkey"": ""Tajni ključ"", - ""secretkey-placeholder"": ""Tajni ključ / Pristupni Ključ"", - ""bucket"": ""Bucket"", - ""bucket-placeholder"": ""Bucket ime"", - ""path"": ""Storage Path"", - ""path-description"": ""You can use the same dynamic variables from local storage, like {filename}"", - ""path-placeholder"": ""custom/path"", - ""url-prefix"": ""URL prefix"", - ""url-prefix-placeholder"": ""Custom URL prefix, optional"", - ""url-suffix"": ""URL suffix"", - ""url-suffix-placeholder"": ""Custom URL suffix, optional"" + ""resource"": { + ""no-resources"": ""Nema resursa."", + ""fetching-data"": ""dohvaćanje podataka..."", + ""copy-link"": ""Kopiraj link"", + ""reset-link"": ""Resetiraj link"", + ""reset-resource-link"": ""Resetiraj Resource link"", + ""reset-link-prompt"": ""Želiš li sigurno resetirati link?\nOvo će break sve trenutne link usages.\n\nTHIS ACTION IS IRREVERSIBLE❗"", + ""delete-resource"": ""Obriši Resource"", + ""linked-amount"": ""Linked amount"", + ""warning-text"": ""Želiš li sigurno izbrisati ovaj resource?\n\nOVO JE NEPOVRATNA AKCIJA❗"", + ""warning-text-unused"": ""Are you sure to delete these unused resources?\n\nOVO JE NEPOVRATNA AKCIJA❗"", + ""no-unused-resources"": ""Nema neiskorištenih resources"", + ""delete-selected-resources"": ""Delete Selected Resources"", + ""no-files-selected"": ""Nema odabranih fajlova❗"", + ""upload-successfully"": ""Upload je uspješan"", + ""file-drag-drop-prompt"": ""Povuci i potegni svoj fajl ovdje kako bi bio prenesen"", + ""search-bar-placeholder"": ""Nađi privitke"", + ""clear"": ""Clear"", + ""create-dialog"": { + ""title"": ""Stvori Resource"", + ""upload-method"": ""Upload metoda"", + ""local-file"": { + ""option"": ""Lokalni fajl"", + ""choose"": ""Odaberi fajl..."" + }, + ""external-link"": { + ""option"": ""Vanjski link"", + ""link"": ""Link"", + ""link-placeholder"": ""https://link.do/tvog/resursa"", + ""file-name"": ""Ime fajla"", + ""file-name-placeholder"": ""Ime fajla"", + ""type"": ""Tip"", + ""type-placeholder"": ""Tip fajla"" + } + } }, - ""member-section"": { - ""create-a-member"": ""Stvori člana"", - ""archive-member"": ""Arhiviraj člana"", - ""archive-warning"": ""❗ Želiš li stvarno arhivirati {{username}}?"", - ""delete-member"": ""Obriši člana"", - ""delete-warning"": ""❗ Želiš li stvarno obrisati {{username}}?\n\nOVA AKCIJA JE NEPOVRATNA ❗"" + ""tag-list"": { + ""tip-text"": ""Unesi `#tag` kako bi stvorio"", + ""create-tag"": ""Stvori Tag"", + ""all-tags"": ""Svi Tagovi"", + ""tag-name"": ""IME_TAGA"" }, - ""system-section"": { - ""server-name"": ""Ime servera"", - ""customize-server"": { - ""title"": ""Uredi Server"", - ""default"": ""Osnovno je memoi"", - ""icon-url"": ""URL ikone"", - ""description"": ""Opis"", - ""locale"": ""Server Locale"", - ""appearance"": ""Izgled Servera"" - }, - ""database-file-size"": ""Veličina baze podataka"", - ""allow-user-signup"": ""Dopusti registraciju drugih korisnika"", - ""ignore-version-upgrade"": ""Ignoriraj nadogradnju"", - ""disable-public-memos"": ""Onemogući javne memoe"", - ""max-upload-size"": ""Maximalna veličina uploada (MiB)"", - ""max-upload-size-hint"": ""Preporučena vrijednost je 32 MiB."", - ""additional-style"": ""Dodatni stil"", - ""additional-script"": ""Dodatna skripta"", - ""additional-style-placeholder"": ""Dodatni CSS kod"", - ""additional-script-placeholder"": ""Dodatni JavaScript kod"", - ""telegram-bot-token"": ""Token Telegram Bota"", - ""telegram-bot-token-description"": ""Telegram Bot Token ili API Proxy kao `http.../bot`"", - ""telegram-bot-token-placeholder"": ""Tvoj Telegram Bot token"", - ""openai-api-key"": ""OpenAI: API Key"", - ""openai-api-key-description"": ""Get API key"", - ""openai-api-key-placeholder"": ""Tvoj OpenAI API Ključ"", - ""openai-api-host"": ""OpenAI: API Host"", - ""openai-api-host-placeholder"": ""Zadano: https://api.openai.com/"", - ""display-with-updated-time"": ""Prikaži sa obnovljenim vremenom"" + ""daily-review"": { + ""title"": ""Pregled dana"", + ""no-memos"": ""Ups. Ovdje nema ničega."" }, - ""appearance-option"": { - ""system"": ""Slijedi sustav"", - ""light"": ""Uvijek svjetla"", - ""dark"": ""Uvijek tamna"" + ""setting"": { + ""my-account"": ""Moj račun"", + ""preference"": ""Postavke"", + ""member"": ""Član"", + ""member-list"": ""Lista članova"", + ""system"": ""Sustav"", + ""storage"": ""Skladište"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""Informacije o računu"", + ""username-note"": ""Koristi se za prijavu"", + ""nickname-note"": ""Prikazano u baneru"", + ""email-note"": ""Po izboru/Neobavezno"", + ""update-information"": ""Ažuriraj Informacije"", + ""change-password"": ""Promijeni lozinku"", + ""reset-api"": ""Resetiraj API"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""Resetiraj OpenAPI Ključ"", + ""openapi-reset-warning"": ""❗ Postojeći API će odsada biti nevaljan i bit će generiran novi.\n\nJesi li siguran da želiš resetirati?"", + ""openapi-sample-post"": ""Zdravo #memos od {{url}}"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Zadana vidljivost memoa"", + ""default-resource-visibility"": ""Zadana resource vidljivost"", + ""enable-folding-memo"": ""Omogući folding memo"", + ""enable-double-click"": ""Omogući uređivanje duplim klikom"", + ""editor-font-style"": ""Editor font stil"", + ""mobile-editor-style"": ""Mobile editor stil"", + ""default-memo-sort-option"": ""Memo display vrijeme"", + ""telegram-user-id"": ""Telegram UserID"", + ""telegram-user-id-placeholder"": ""Send any words to Your Telegram Bot to get"", + ""created_ts"": ""Vrijeme stvaranja"", + ""updated_ts"": ""Vrijeme ažuriranja"", + ""daily-review-time-offset"": ""Daily Review Time Offset"", + ""auto-collapse"": ""Auto Collapse"" + }, + ""storage-section"": { + ""current-storage"": ""Trenutno skladište objekata"", + ""type-database"": ""Databaza"", + ""type-local"": ""Local"", + ""storage-services-list"": ""Storage service list"", + ""create-a-service"": ""Stvori service"", + ""update-a-service"": ""Ažuriraj service"", + ""warning-text"": ""Jesi li siguran da želiš obrisati storage service \""{{name}}\""?\n\nOVA AKCIJA JE NEPOVRATNA❗"", + ""delete-storage"": ""Obriši Skladište"", + ""local-storage-path"": ""Local storage path"", + ""update-local-path"": ""Ažuriraj Local Storage Path"", + ""update-local-path-description"": ""Local storage path je relativna putanja do fajla tvoje baze podataka"", + ""create-storage"": ""Stvori Storage"", + ""update-storage"": ""Ažuriraj Storage"", + ""endpoint"": ""Endpoint"", + ""s3-compatible-url"": ""S3 kompatibilan URL"", + ""region"": ""Regija"", + ""region-placeholder"": ""Ime regije"", + ""accesskey"": ""Pristupni ključ"", + ""accesskey-placeholder"": ""Pristupni ključ / Access ID"", + ""secretkey"": ""Tajni ključ"", + ""secretkey-placeholder"": ""Tajni ključ / Pristupni Ključ"", + ""bucket"": ""Bucket"", + ""bucket-placeholder"": ""Bucket ime"", + ""path"": ""Storage Path"", + ""path-description"": ""You can use the same dynamic variables from local storage, like {filename}"", + ""path-placeholder"": ""custom/path"", + ""url-prefix"": ""URL prefix"", + ""url-prefix-placeholder"": ""Custom URL prefix, optional"", + ""url-suffix"": ""URL suffix"", + ""url-suffix-placeholder"": ""Custom URL suffix, optional"" + }, + ""member-section"": { + ""create-a-member"": ""Stvori člana"", + ""archive-member"": ""Arhiviraj člana"", + ""archive-warning"": ""❗ Želiš li stvarno arhivirati {{username}}?"", + ""delete-member"": ""Obriši člana"", + ""delete-warning"": ""❗ Želiš li stvarno obrisati {{username}}?\n\nOVA AKCIJA JE NEPOVRATNA ❗"" + }, + ""system-section"": { + ""server-name"": ""Ime servera"", + ""customize-server"": { + ""title"": ""Uredi Server"", + ""default"": ""Osnovno je memoi"", + ""icon-url"": ""URL ikone"", + ""description"": ""Opis"", + ""locale"": ""Server Locale"", + ""appearance"": ""Izgled Servera"" + }, + ""database-file-size"": ""Veličina baze podataka"", + ""allow-user-signup"": ""Dopusti registraciju drugih korisnika"", + ""ignore-version-upgrade"": ""Ignoriraj nadogradnju"", + ""disable-public-memos"": ""Onemogući javne memoe"", + ""max-upload-size"": ""Maximalna veličina uploada (MiB)"", + ""max-upload-size-hint"": ""Preporučena vrijednost je 32 MiB."", + ""additional-style"": ""Dodatni stil"", + ""additional-script"": ""Dodatna skripta"", + ""additional-style-placeholder"": ""Dodatni CSS kod"", + ""additional-script-placeholder"": ""Dodatni JavaScript kod"", + ""telegram-bot-token"": ""Token Telegram Bota"", + ""telegram-bot-token-description"": ""Telegram Bot Token ili API Proxy kao `http.../bot`"", + ""telegram-bot-token-placeholder"": ""Tvoj Telegram Bot token"", + ""display-with-updated-time"": ""Prikaži sa obnovljenim vremenom"" + }, + ""appearance-option"": { + ""system"": ""Slijedi sustav"", + ""light"": ""Uvijek svjetla"", + ""dark"": ""Uvijek tamna"" + }, + ""sso-section"": { + ""sso-list"": ""SSO Lista"", + ""delete-sso"": ""Potvrdi brisanje"", + ""confirm-delete"": ""Želiš li sigurno obrisati \""{{name}}\"" SSO konfiguraciju?\n\nOVA JE AKCIJA NEPOVRATNA ❗"", + ""create-sso"": ""Stvori SSO"", + ""update-sso"": ""Update SSO"", + ""sso-created"": ""SSO {{name}} je stvoren"", + ""sso-updated"": ""SSO {{name}} ažuriran"", + ""identifier"": ""Identifier"", + ""display-name"": ""Display Ime"", + ""template"": ""Predložak"", + ""custom"": ""Custom"", + ""identifier-filter"": ""Identifier Filter"", + ""redirect-url"": ""Preusmjeri URL"", + ""client-id"": ""Klijent ID"", + ""client-secret"": ""Client secret"", + ""authorization-endpoint"": ""Authorization endpoint"", + ""token-endpoint"": ""Token endpoint"", + ""user-endpoint"": ""User endpoint"", + ""scopes"": ""Scopes"" + } }, - ""sso-section"": { - ""sso-list"": ""SSO Lista"", - ""delete-sso"": ""Potvrdi brisanje"", - ""confirm-delete"": ""Želiš li sigurno obrisati \""{{name}}\"" SSO konfiguraciju?\n\nOVA JE AKCIJA NEPOVRATNA ❗"", - ""create-sso"": ""Stvori SSO"", - ""update-sso"": ""Update SSO"", - ""sso-created"": ""SSO {{name}} je stvoren"", - ""sso-updated"": ""SSO {{name}} ažuriran"", - ""identifier"": ""Identifier"", - ""display-name"": ""Display Ime"", - ""template"": ""Predložak"", - ""custom"": ""Custom"", - ""identifier-filter"": ""Identifier Filter"", - ""redirect-url"": ""Preusmjeri URL"", - ""client-id"": ""Klijent ID"", - ""client-secret"": ""Client secret"", - ""authorization-endpoint"": ""Authorization endpoint"", - ""token-endpoint"": ""Token endpoint"", - ""user-endpoint"": ""User endpoint"", - ""scopes"": ""Scopes"" - } - }, - ""filter"": { - ""new-filter"": ""Novi Filtar"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Tip"", - ""text"": ""Text"", - ""display-time"": ""Prikaži vrijeme"", - ""visibility"": ""Vidljivost"" + ""message"": { + ""memos-ready"": ""svi memoi su spremni 🎉"", + ""resource-ready"": ""svi resursi su spremni 🎉"", + ""restored-successfully"": ""Uspješno vraćeno"", + ""memo-updated-datetime"": ""Datum/vrijeme stvaranja memoa je promijenjen."", + ""invalid-created-datetime"": ""Datum i vrijeme stvaranja nije valjano uneseno."", + ""change-memo-created-time"": ""Promijeni vrijeme stvaranja memoa"", + ""change-memo-created-time-warning-1"": ""OVO NIJE NORMALNO PONAŠANJE."", + ""change-memo-created-time-warning-2"": ""Budi sasvim siguran da ti ovo stvarno treba."", + ""memo-not-found"": ""Memo nije nađen."", + ""fill-all"": ""Molimo, popuni sva polja."", + ""password-not-match"": ""Lozinke nisu jednake."", + ""new-password-not-match"": ""Nove lozinke nisu jednake."", + ""image-load-failed"": ""slika nije uspješno učitana"", + ""fill-form"": ""Please fill out this form"", + ""fill-server-name"": ""Molim, unesi ime servera"", + ""login-failed"": ""Prijava nije uspjela"", + ""signup-failed"": ""Registracija nije uspjela"", + ""user-not-found"": ""Korisnik nije nađen"", + ""password-changed"": ""Lozinka je promijenjena"", + ""private-only"": ""Ovaj je memo privatan."", + ""copied"": ""Kopirano"", + ""succeed-copy-content"": ""Sadržaj je uspješno kopiran."", + ""succeed-copy-code"": ""Kod je uspješno kopiran."", + ""succeed-copy-link"": ""Link je uspješno kopiran."", + ""change-resource-filename"": ""Promijeni ime resursa"", + ""resource-filename-updated"": ""Resource filename je promijenjeno."", + ""invalid-resource-filename"": ""Nevaljano ime fajla."", + ""click-to-save-the-image"": ""Klikni da spremiš sliku"", + ""generating-the-screenshot"": ""Generiranje screenshota..."", + ""count-selected-resources"": ""Ukupno odabrano"", + ""succeed-vacuum-database"": ""Vakuumiranje databaze je uspjelo"", + ""succeed-update-additional-style"": ""Dodatni stil je uspješno obnovljen."", + ""succeed-copy-resource-link"": ""Resource link je uspješno kopiran."", + ""succeed-update-customized-profile"": ""Profil je uspješno izmijenjen."", + ""succeed-update-additional-script"": ""Dodatna skripta je uspješno izmijenjena."", + ""update-succeed"": ""Obnavljanje aplikacije je uspjelo!🎉"", + ""page-not-found"": ""404 - Stranica nije nađena 😥"", + ""maximum-upload-size-is"": ""Maximalna dozvoljena veličina fajla je {{size}} MiB"", + ""file-exceeds-upload-limit-of"": ""Fajl {{file}} premašuje limit za upload koji je {{size}} MiB"" }, - ""operator"": { - ""contains"": ""Sadrži"", - ""not-contains"": ""Ne sadrži"", - ""is"": ""je"", - ""is-not"": ""nije"", - ""before"": ""Prije"", - ""after"": ""Poslije"" + ""days"": { + ""mon"": ""Pon"", + ""tue"": ""Uto"", + ""wed"": ""Sri"", + ""thu"": ""Čet"", + ""fri"": ""Pet"", + ""sat"": ""Sub"", + ""sun"": ""Ned"" }, - ""value"": { - ""not-tagged"": ""Bez tagova"", - ""linked"": ""Ima linkove"", - ""has-attachment"": ""Ima privitke"" + ""embed-memo"": { + ""title"": ""Ugradi Memo"", + ""text"": ""Kopiraj i podijeli kod ispod na svom blogu ili web stranici."", + ""only-public-supported"": ""* Samo javni memoi mogu biti ugrađeni."", + ""copy"": ""Kopiraj"" }, - ""text-placeholder"": ""Započni sa ^ da koristiš regex"", - ""and"": ""i"", - ""or"": ""ili"" - }, - ""message"": { - ""no-memos"": ""nema memoa 🌃"", - ""memos-ready"": ""svi memoi su spremni 🎉"", - ""no-resource"": ""nema resursa 🌃"", - ""resource-ready"": ""svi resursi su spremni 🎉"", - ""restored-successfully"": ""Uspješno vraćeno"", - ""memo-updated-datetime"": ""Datum/vrijeme stvaranja memoa je promijenjen."", - ""invalid-created-datetime"": ""Datum i vrijeme stvaranja nije valjano uneseno."", - ""change-memo-created-time"": ""Promijeni vrijeme stvaranja memoa"", - ""change-memo-created-time-warning-1"": ""OVO NIJE NORMALNO PONAŠANJE."", - ""change-memo-created-time-warning-2"": ""Budi sasvim siguran da ti ovo stvarno treba."", - ""memo-not-found"": ""Memo nije nađen."", - ""fill-all"": ""Molimo, popuni sva polja."", - ""password-not-match"": ""Lozinke nisu jednake."", - ""new-password-not-match"": ""Nove lozinke nisu jednake."", - ""image-load-failed"": ""slika nije uspješno učitana"", - ""fill-form"": ""Please fill out this form"", - ""fill-server-name"": ""Molim, unesi ime servera"", - ""login-failed"": ""Prijava nije uspjela"", - ""signup-failed"": ""Registracija nije uspjela"", - ""user-not-found"": ""Korisnik nije nađen"", - ""password-changed"": ""Lozinka je promijenjena"", - ""private-only"": ""Ovaj je memo privatan."", - ""copied"": ""Kopirano"", - ""succeed-copy-content"": ""Sadržaj je uspješno kopiran."", - ""succeed-copy-code"": ""Kod je uspješno kopiran."", - ""succeed-copy-link"": ""Link je uspješno kopiran."", - ""change-resource-filename"": ""Promijeni ime resursa"", - ""resource-filename-updated"": ""Resource filename je promijenjeno."", - ""invalid-resource-filename"": ""Nevaljano ime fajla."", - ""click-to-save-the-image"": ""Klikni da spremiš sliku"", - ""generating-the-screenshot"": ""Generiranje screenshota..."", - ""count-selected-resources"": ""Ukupno odabrano"", - ""too-short"": ""prekratko"", - ""too-long"": ""predugo"", - ""not-allow-space"": ""Ne dozvoli razmak"", - ""not-allow-chinese"": ""Ne dozvoli kineski"", - ""succeed-vacuum-database"": ""Vakuumiranje databaze je uspjelo"", - ""succeed-update-additional-style"": ""Dodatni stil je uspješno obnovljen."", - ""succeed-copy-resource-link"": ""Resource link je uspješno kopiran."", - ""succeed-update-customized-profile"": ""Profil je uspješno izmijenjen."", - ""succeed-update-additional-script"": ""Dodatna skripta je uspješno izmijenjena."", - ""update-succeed"": ""Obnavljanje aplikacije je uspjelo!🎉"", - ""page-not-found"": ""404 - Stranica nije nađena 😥"", - ""maximum-upload-size-is"": ""Maximalna dozvoljena veličina fajla je {{size}} MiB"", - ""file-exceeds-upload-limit-of"": ""Fajl {{file}} premašuje limit za upload koji je {{size}} MiB"" - }, - ""days"": { - ""mon"": ""Pon"", - ""tue"": ""Uto"", - ""wed"": ""Sri"", - ""thu"": ""Čet"", - ""fri"": ""Pet"", - ""sat"": ""Sub"", - ""sun"": ""Ned"" - }, - ""ask-ai"": { - ""title"": ""Pitaj AI"", - ""not-enabled"": ""Nisi postavio svoj OpenAI API ključ."", - ""go-to-settings"": ""Idi na postavke"", - ""placeholder"": ""Pitaj bilo što…"", - ""default-message-group-title"": ""Default Session"", - ""create-message-group-title"": ""Stvori sesiju"", - ""label-message-group-name-title"": ""Ime sesije"" - }, - ""embed-memo"": { - ""title"": ""Ugradi Memo"", - ""text"": ""Kopiraj i podijeli kod ispod na svom blogu ili web stranici."", - ""only-public-supported"": ""* Samo javni memoi mogu biti ugrađeni."", - ""copy"": ""Kopiraj"" - }, - ""heatmap"": { - ""memo-in"": ""memo u {{period}}"", - ""memos-in"": ""memoa u {{period}}"", - ""memo-on"": ""{{amount}} memo {{date}}"", - ""memos-on"": ""{{amount}} memos {{date}}"", - ""day"": ""dan"", - ""days"": ""dani"" - }, - ""about"": { - ""about-memos"": ""O Memo aplikaciji"", - ""memos-description"": ""Memo je web bazirana aplikacija koju možeš koristiti za pisanje, organiziranje i dijeljenje bilješki."", - ""no-server-description"": ""Za ovaj server nije konfiguriran opis."", - ""powered-by"": ""Powered by"", - ""other-projects"": ""Drugi projekti"" - } + ""heatmap"": { + ""memo-in"": ""memo u {{period}}"", + ""memos-in"": ""memoa u {{period}}"", + ""memo-on"": ""{{amount}} memo {{date}}"", + ""memos-on"": ""{{amount}} memos {{date}}"", + ""day"": ""dan"", + ""days"": ""dani"" + }, + ""about"": { + ""about-memos"": ""O Memo aplikaciji"", + ""memos-description"": ""Memo je web bazirana aplikacija koju možeš koristiti za pisanje, organiziranje i dijeljenje bilješki."", + ""no-server-description"": ""Za ovaj server nije konfiguriran opis."", + ""powered-by"": ""Powered by"", + ""other-projects"": ""Drugi projekti"" + } } diff --git a/web/src/locales/it.json b/web/src/locales/it.json index 868c0f3cebcd6..3547c8526e0e8 100644 --- a/web/src/locales/it.json +++ b/web/src/locales/it.json @@ -1,412 +1,360 @@ { - ""common"": { - ""memos-slogan"": ""Un hub memo leggero e self-hosted. Open Source e gratuito per sempre."", - ""about"": ""Informazioni"", - ""home"": ""Home"", - ""resources"": ""Risorse"", - ""settings"": ""Impostazioni"", - ""archived"": ""Archiviati"", - ""email"": ""Email"", - ""password"": ""Password"", - ""avatar"": ""Avatar"", - ""username"": ""Nome utente"", - ""nickname"": ""Nickname"", - ""save"": ""Salva"", - ""close"": ""Chiudi"", - ""cancel"": ""Cancella"", - ""create"": ""Crea"", - ""update"": ""Aggiorna"", - ""change"": ""Cambia"", - ""confirm"": ""Conferma"", - ""reset"": ""Reset"", - ""language"": ""Lingua"", - ""version"": ""Versione"", - ""pin"": ""Fissa"", - ""unpin"": ""Rimuovi"", - ""edit"": ""Modifica"", - ""restore"": ""Ripristina"", - ""delete"": ""Elimina"", - ""null"": ""Null"", - ""share"": ""Condividi"", - ""archive"": ""Archivia"", - ""basic"": ""Base"", - ""admin"": ""Admin"", - ""explore"": ""Esplora"", - ""sign-in"": ""Accedi"", - ""sign-in-with"": ""Accedi con {{provider}}"", - ""or"": ""oppure"", - ""sign-up"": ""Registrati"", - ""sign-out"": ""Esci"", - ""type"": ""Tipo"", - ""title"": ""Titolo"", - ""filter"": ""Filtro"", - ""filter-period"": ""{{from}} a {{to}}"", - ""tags"": ""Tags"", - ""yourself"": ""Te stesso"", - ""changed"": ""Modificato"", - ""fold"": ""Riduci"", - ""expand"": ""Espandi"", - ""image"": ""Immagine"", - ""link"": ""Link"", - ""vacuum"": ""Ottimizza"", - ""select"": ""Seleziona"", - ""database"": ""Database"", - ""upload"": ""Carica"", - ""preview"": ""Anteprima"", - ""rename"": ""Rinomina"", - ""clear"": ""Pulisci"", - ""name"": ""Nome"", - ""visibility"": ""Visibilità"", - ""learn-more"": ""Scopri di più"", - ""beta"": ""Beta"", - ""new"": ""Nuovo"", - ""dialog"": { - ""error"": ""Errore"", - ""help"": ""Aiuto"", - ""info"": ""Informazione"", - ""success"": ""Successo"", - ""warning"": ""Attenzione"" + ""common"": { + ""about"": ""Informazioni"", + ""home"": ""Home"", + ""resources"": ""Risorse"", + ""settings"": ""Impostazioni"", + ""archived"": ""Archiviati"", + ""email"": ""Email"", + ""password"": ""Password"", + ""avatar"": ""Avatar"", + ""username"": ""Nome utente"", + ""nickname"": ""Nickname"", + ""save"": ""Salva"", + ""close"": ""Chiudi"", + ""cancel"": ""Cancella"", + ""create"": ""Crea"", + ""update"": ""Aggiorna"", + ""change"": ""Cambia"", + ""confirm"": ""Conferma"", + ""reset"": ""Reset"", + ""language"": ""Lingua"", + ""version"": ""Versione"", + ""pin"": ""Fissa"", + ""unpin"": ""Rimuovi"", + ""edit"": ""Modifica"", + ""restore"": ""Ripristina"", + ""delete"": ""Elimina"", + ""null"": ""Null"", + ""share"": ""Condividi"", + ""archive"": ""Archivia"", + ""basic"": ""Base"", + ""admin"": ""Admin"", + ""explore"": ""Esplora"", + ""sign-in"": ""Accedi"", + ""sign-in-with"": ""Accedi con {{provider}}"", + ""or"": ""oppure"", + ""sign-up"": ""Registrati"", + ""sign-out"": ""Esci"", + ""type"": ""Tipo"", + ""title"": ""Titolo"", + ""filter"": ""Filtro"", + ""filter-period"": ""{{from}} a {{to}}"", + ""tags"": ""Tags"", + ""yourself"": ""Te stesso"", + ""changed"": ""Modificato"", + ""fold"": ""Riduci"", + ""expand"": ""Espandi"", + ""image"": ""Immagine"", + ""link"": ""Link"", + ""vacuum"": ""Ottimizza"", + ""select"": ""Seleziona"", + ""database"": ""Database"", + ""upload"": ""Carica"", + ""preview"": ""Anteprima"", + ""rename"": ""Rinomina"", + ""clear"": ""Pulisci"", + ""name"": ""Nome"", + ""visibility"": ""Visibilità"", + ""learn-more"": ""Scopri di più"", + ""beta"": ""Beta"", + ""new"": ""Nuovo"", + ""mark"": ""Cita"" }, - ""mark"": ""Cita"" - }, - ""router"": { - ""back-to-home"": ""Torna alla home"" - }, - ""auth"": { - ""signup-as-host"": ""Registrati come proprietario"", - ""host-tip"": ""Ti stai registrando come proprietario del sito."", - ""not-host-tip"": ""Se non hai un account, contatta il proprietario del sito."", - ""new-password"": ""Nuova password"", - ""repeat-new-password"": ""Ripeti la nuova password"" - }, - ""editor"": { - ""editing"": ""Modificando..."", - ""cancel-edit"": ""Cancella modifica"", - ""save"": ""Salva"", - ""placeholder"": ""Qualsiasi cosa pensi..."", - ""only-image-supported"": ""Solo immagini supportate."", - ""cant-empty"": ""Il contenuto non può essere vuoto"", - ""local"": ""Locale"", - ""resources"": ""Risorse"" - }, - ""memo"": { - ""view-detail"": ""Vedi dettagli"", - ""copy-link"": ""Copia link"", - ""embed"": ""Includi"", - ""archived-memos"": ""Memo archiviati"", - ""no-archived-memos"": ""Nessun memo archiviato."", - ""fetching-data"": ""Caricamento..."", - ""fetch-more"": ""Clicca qui per caricare di più"", - ""archived-at"": ""Archiviato il"", - ""search-placeholder"": ""Cerca memos"", - ""visibility"": { - ""private"": ""Privato"", - ""protected"": ""Visibile ai membri"", - ""public"": ""Pubblico"", - ""disabled"": ""I memo pubblici sono disattivati"" + ""auth"": { + ""host-tip"": ""Ti stai registrando come proprietario del sito."", + ""new-password"": ""Nuova password"", + ""repeat-new-password"": ""Ripeti la nuova password"" }, - ""delete-memo"": ""Elimina Memo"", - ""delete-confirm"": ""Sei sicuro di voler eliminare questo memo?\n\nQUESTA AZIONE È IRREVERSIBILE❗"" - }, - ""resource"": { - ""no-resources"": ""Nessuna risorsa."", - ""fetching-data"": ""Caricamento..."", - ""copy-link"": ""Copia Link"", - ""reset-link"": ""Ripristina Link"", - ""reset-resource-link"": ""Ripristina link risorse"", - ""reset-link-prompt"": ""Sei sicuro di voler ripristinare questo link?\nQuesto renderà tutti i vecchi link inutilizzabili.\n\nQUESTA AZIONE È IRREVERSIBILE❗"", - ""delete-resource"": ""Elimina risorsa"", - ""linked-amount"": ""Linked amount"", - ""warning-text"": ""Sei sicuro di voler eliminare questa risorsa?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", - ""warning-text-unused"": ""Sei sicuro di voler eliminare le risorse inutilizzate?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", - ""no-unused-resources"": ""Nessuna risorsa inutilizzata"", - ""delete-selected-resources"": ""Elimina risorse selezionate"", - ""no-files-selected"": ""Nessun file selezionato❗"", - ""upload-successfully"": ""Caricamento avvenuto con successo"", - ""file-drag-drop-prompt"": ""Trascina un file qua per caricarlo"", - ""search-bar-placeholder"": ""Cerca risorse"", - ""clear"": ""Cancella"", - ""create-dialog"": { - ""title"": ""Nuova risorsa"", - ""upload-method"": ""Metodo di caricamento"", - ""local-file"": { - ""option"": ""File locale"", - ""choose"": ""Carica file..."" - }, - ""external-link"": { - ""option"": ""Link esterno"", - ""link"": ""Link"", - ""link-placeholder"": ""https://the.link.to/your/resource"", - ""file-name"": ""Nome file"", - ""file-name-placeholder"": ""Nome file"", - ""type"": ""Tipo"", - ""type-placeholder"": ""Tipo file"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""Scrivi `#tag` per crearlo"", - ""create-tag"": ""Crea Tag"", - ""all-tags"": ""Tutti i Tags"", - ""tag-name"": ""NOME_TAG"", - ""invalid-tag-name"": ""Nome tag non valido"" - }, - ""daily-review"": { - ""title"": ""Revisione giornaliera"", - ""no-memos"": ""Nessun memo oggi."" - }, - ""setting"": { - ""my-account"": ""Il mio account"", - ""preference"": ""Preferenze"", - ""member"": ""Membri"", - ""member-list"": ""Lista membri"", - ""system"": ""Sistema"", - ""openai"": ""OpenAI"", - ""storage"": ""Archiviazione"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""Il mio account"", - ""username-note"": ""Usato per il login"", - ""nickname-note"": ""Mostrato nel banner"", - ""email-note"": ""Opzionale"", - ""update-information"": ""Aggiorna informazioni"", - ""change-password"": ""Cambia password"", - ""reset-api"": ""Ripristina API"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""Ripristina key OpenAPI"", - ""openapi-reset-warning"": ""❗ L'API esistente verrà invalidata e ne verrà generata una nuova.\n\nSei sicuro di voler ripristinare?"", - ""openapi-sample-post"": ""Ciao #memos da {{url}}"" + ""editor"": { + ""editing"": ""Modificando..."", + ""cancel-edit"": ""Cancella modifica"", + ""save"": ""Salva"", + ""placeholder"": ""Qualsiasi cosa pensi..."", + ""only-image-supported"": ""Solo immagini supportate."", + ""cant-empty"": ""Il contenuto non può essere vuoto"", + ""local"": ""Locale"", + ""resources"": ""Risorse"" }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Visibilità memo predefinita"", - ""default-resource-visibility"": ""Visibilità risorsa predefinita"", - ""enable-folding-memo"": ""Abilita riduzione memo"", - ""enable-double-click"": ""Abilita doppio click per modificare"", - ""editor-font-style"": ""Stile font editor"", - ""mobile-editor-style"": ""Stile editor mobile"", - ""default-memo-sort-option"": ""Ordinamento memo predefinito"", - ""telegram-user-id"": ""UserID Telegram"", - ""telegram-user-id-placeholder"": ""Salva i messaggi al tuo bot telegram come memo"", - ""created_ts"": ""Tempo di creazione"", - ""updated_ts"": ""Tempo di aggiornamento"", - ""daily-review-time-offset"": ""Ora di revisione giornaliera"", - ""auto-collapse"": ""Riduci automaticamente"" + ""memo"": { + ""view-detail"": ""Vedi dettagli"", + ""copy-link"": ""Copia link"", + ""embed"": ""Includi"", + ""archived-memos"": ""Memo archiviati"", + ""no-archived-memos"": ""Nessun memo archiviato."", + ""fetching-data"": ""Caricamento..."", + ""fetch-more"": ""Clicca qui per caricare di più"", + ""archived-at"": ""Archiviato il"", + ""search-placeholder"": ""Cerca memos"", + ""visibility"": { + ""private"": ""Privato"", + ""protected"": ""Visibile ai membri"", + ""public"": ""Pubblico"", + ""disabled"": ""I memo pubblici sono disattivati"" + }, + ""delete-memo"": ""Elimina Memo"", + ""delete-confirm"": ""Sei sicuro di voler eliminare questo memo?\n\nQUESTA AZIONE È IRREVERSIBILE❗"" }, - ""storage-section"": { - ""current-storage"": ""Archiviazione corrente"", - ""type-database"": ""Database"", - ""type-local"": ""Locale"", - ""storage-services-list"": ""Lista servizi di archiviazione"", - ""create-a-service"": ""Crea un servizio"", - ""update-a-service"": ""Aggiorna un servizio"", - ""warning-text"": ""Sei sicuro di voler eliminare questo servizio di archiviazione \""{{name}}\""?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", - ""delete-storage"": ""Elimina archiviazione"", - ""local-storage-path"": ""Percorso archiviazione locale"", - ""update-local-path"": ""Aggiorna percorso archiviazione locale"", - ""update-local-path-description"": ""Il percorso di archiviazione locale è un percorso relativo al tuo file database"", - ""create-storage"": ""Crea archiviazione"", - ""update-storage"": ""Aggiorna archiviazione"", - ""endpoint"": ""Endpoint"", - ""s3-compatible-url"": ""URL compatibile S3"", - ""region"": ""Regione"", - ""region-placeholder"": ""Nome regione"", - ""accesskey"": ""Access key"", - ""accesskey-placeholder"": ""Access key / Access ID"", - ""secretkey"": ""Secret key"", - ""secretkey-placeholder"": ""Secret key / Access Key"", - ""bucket"": ""Bucket"", - ""bucket-placeholder"": ""Nome bucket"", - ""path"": ""Percorso"", - ""path-description"": ""Puoi usare le stesse variabili dinamiche dall'archiviazione locale, come {filename}"", - ""path-placeholder"": ""custom/path"", - ""url-prefix"": ""Prefisso URL"", - ""url-prefix-placeholder"": ""Prefisso URL custom, opzionale"", - ""url-suffix"": ""Suffisso URL"", - ""url-suffix-placeholder"": ""Suffisso URL custom, opzionale"" + ""resource"": { + ""no-resources"": ""Nessuna risorsa."", + ""fetching-data"": ""Caricamento..."", + ""copy-link"": ""Copia Link"", + ""reset-link"": ""Ripristina Link"", + ""reset-resource-link"": ""Ripristina link risorse"", + ""reset-link-prompt"": ""Sei sicuro di voler ripristinare questo link?\nQuesto renderà tutti i vecchi link inutilizzabili.\n\nQUESTA AZIONE È IRREVERSIBILE❗"", + ""delete-resource"": ""Elimina risorsa"", + ""linked-amount"": ""Linked amount"", + ""warning-text"": ""Sei sicuro di voler eliminare questa risorsa?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", + ""warning-text-unused"": ""Sei sicuro di voler eliminare le risorse inutilizzate?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", + ""no-unused-resources"": ""Nessuna risorsa inutilizzata"", + ""delete-selected-resources"": ""Elimina risorse selezionate"", + ""no-files-selected"": ""Nessun file selezionato❗"", + ""upload-successfully"": ""Caricamento avvenuto con successo"", + ""file-drag-drop-prompt"": ""Trascina un file qua per caricarlo"", + ""search-bar-placeholder"": ""Cerca risorse"", + ""clear"": ""Cancella"", + ""create-dialog"": { + ""title"": ""Nuova risorsa"", + ""upload-method"": ""Metodo di caricamento"", + ""local-file"": { + ""option"": ""File locale"", + ""choose"": ""Carica file..."" + }, + ""external-link"": { + ""option"": ""Link esterno"", + ""link"": ""Link"", + ""link-placeholder"": ""https://the.link.to/your/resource"", + ""file-name"": ""Nome file"", + ""file-name-placeholder"": ""Nome file"", + ""type"": ""Tipo"", + ""type-placeholder"": ""Tipo file"" + } + } }, - ""member-section"": { - ""create-a-member"": ""Crea un membro"", - ""archive-member"": ""Archivia membro"", - ""archive-warning"": ""❗ Sei sicuro di voler archiviare {{username}}?"", - ""delete-member"": ""Elimina membro"", - ""delete-warning"": ""❗ Sei sicuro di voler eliminare {{username}}?\n\nQUESTA AZIONE È IRREVERSIBILE❗"" + ""tag-list"": { + ""tip-text"": ""Scrivi `#tag` per crearlo"", + ""create-tag"": ""Crea Tag"", + ""all-tags"": ""Tutti i Tags"", + ""tag-name"": ""NOME_TAG"", + ""invalid-tag-name"": ""Nome tag non valido"" }, - ""system-section"": { - ""server-name"": ""Nome server"", - ""customize-server"": { - ""title"": ""Personalizza server"", - ""default"": ""Preferinito è Memos"", - ""icon-url"": ""URL icona"", - ""description"": ""Descrizione"", - ""locale"": ""Server Locale"", - ""appearance"": ""Aspetto server"" - }, - ""database-file-size"": ""Dimensione file database"", - ""allow-user-signup"": ""Consenti registrazione utente"", - ""disable-password-login"": ""Disabilita login password"", - ""disable-password-login-warning"": ""Ciò disabiliterà l'accesso tramite password per tutti gli utenti. Non è possibile accedere senza ripristinare questa impostazione nel database se i provider di identità configurati falliscono. Dovrai anche prestare molta attenzione quando rimuovi un provider di identità❗"", - ""disable-password-login-final-warning"": ""Digita \""CONFERMA\"" se sai cosa stai facendo."", - ""enable-password-login"": ""Abilita login password"", - ""enable-password-login-warning"": ""Ciò consentirà l'accesso tramite password per tutti gli utenti. Continua solo se desideri che gli utenti possano accedere utilizzando sia SSO che password❗"", - ""ignore-version-upgrade"": ""Ignora aggiornamento versione"", - ""disable-public-memos"": ""Disabilita memo pubblici"", - ""max-upload-size"": ""Dimensione massima caricamento (MiB)"", - ""max-upload-size-hint"": ""Valore consigliato di 32 MiB."", - ""auto-backup-interval"": ""Intervallo auto backup (secondi)"", - ""auto-backup-interval-hint"": ""Inserire 0 per disattivare backup automatici. È richiesto il riavvio per salvare l'impostazione."", - ""additional-style"": ""Stile aggiuntivo"", - ""additional-script"": ""Script aggiuntivo"", - ""additional-style-placeholder"": ""Codice CSS aggiuntivo"", - ""additional-script-placeholder"": ""Codice JS aggiuntivo"", - ""telegram-bot-token"": ""Token Bot Telegram"", - ""telegram-bot-token-description"": ""Token bot Telegram o API Proxy come `http.../bot`"", - ""telegram-bot-token-placeholder"": ""Il token del tuo bot Telegram"", - ""openai-api-key"": ""OpenAI: API Key"", - ""openai-api-key-description"": ""Ottieni key API"", - ""openai-api-key-placeholder"": ""La tua OpenAI key API"", - ""openai-api-host"": ""OpenAI: API Host"", - ""openai-api-host-placeholder"": ""Default: https://api.openai.com/"", - ""display-with-updated-time"": ""Mostra con tempo aggiornato"" + ""daily-review"": { + ""title"": ""Revisione giornaliera"", + ""no-memos"": ""Nessun memo oggi."" }, - ""appearance-option"": { - ""system"": ""Sistema"", - ""light"": ""Sempre chiaro"", - ""dark"": ""Sempre scuro"" + ""setting"": { + ""my-account"": ""Il mio account"", + ""preference"": ""Preferenze"", + ""member"": ""Membri"", + ""member-list"": ""Lista membri"", + ""system"": ""Sistema"", + ""storage"": ""Archiviazione"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""Il mio account"", + ""username-note"": ""Usato per il login"", + ""nickname-note"": ""Mostrato nel banner"", + ""email-note"": ""Opzionale"", + ""update-information"": ""Aggiorna informazioni"", + ""change-password"": ""Cambia password"", + ""reset-api"": ""Ripristina API"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""Ripristina key OpenAPI"", + ""openapi-reset-warning"": ""❗ L'API esistente verrà invalidata e ne verrà generata una nuova.\n\nSei sicuro di voler ripristinare?"", + ""openapi-sample-post"": ""Ciao #memos da {{url}}"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Visibilità memo predefinita"", + ""default-resource-visibility"": ""Visibilità risorsa predefinita"", + ""enable-folding-memo"": ""Abilita riduzione memo"", + ""enable-double-click"": ""Abilita doppio click per modificare"", + ""editor-font-style"": ""Stile font editor"", + ""mobile-editor-style"": ""Stile editor mobile"", + ""default-memo-sort-option"": ""Ordinamento memo predefinito"", + ""telegram-user-id"": ""UserID Telegram"", + ""telegram-user-id-placeholder"": ""Salva i messaggi al tuo bot telegram come memo"", + ""created_ts"": ""Tempo di creazione"", + ""updated_ts"": ""Tempo di aggiornamento"", + ""daily-review-time-offset"": ""Ora di revisione giornaliera"", + ""auto-collapse"": ""Riduci automaticamente"" + }, + ""storage-section"": { + ""current-storage"": ""Archiviazione corrente"", + ""type-database"": ""Database"", + ""type-local"": ""Locale"", + ""storage-services-list"": ""Lista servizi di archiviazione"", + ""create-a-service"": ""Crea un servizio"", + ""update-a-service"": ""Aggiorna un servizio"", + ""warning-text"": ""Sei sicuro di voler eliminare questo servizio di archiviazione \""{{name}}\""?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", + ""delete-storage"": ""Elimina archiviazione"", + ""local-storage-path"": ""Percorso archiviazione locale"", + ""update-local-path"": ""Aggiorna percorso archiviazione locale"", + ""update-local-path-description"": ""Il percorso di archiviazione locale è un percorso relativo al tuo file database"", + ""create-storage"": ""Crea archiviazione"", + ""update-storage"": ""Aggiorna archiviazione"", + ""endpoint"": ""Endpoint"", + ""s3-compatible-url"": ""URL compatibile S3"", + ""region"": ""Regione"", + ""region-placeholder"": ""Nome regione"", + ""accesskey"": ""Access key"", + ""accesskey-placeholder"": ""Access key / Access ID"", + ""secretkey"": ""Secret key"", + ""secretkey-placeholder"": ""Secret key / Access Key"", + ""bucket"": ""Bucket"", + ""bucket-placeholder"": ""Nome bucket"", + ""path"": ""Percorso"", + ""path-description"": ""Puoi usare le stesse variabili dinamiche dall'archiviazione locale, come {filename}"", + ""path-placeholder"": ""custom/path"", + ""url-prefix"": ""Prefisso URL"", + ""url-prefix-placeholder"": ""Prefisso URL custom, opzionale"", + ""url-suffix"": ""Suffisso URL"", + ""url-suffix-placeholder"": ""Suffisso URL custom, opzionale"" + }, + ""member-section"": { + ""create-a-member"": ""Crea un membro"", + ""archive-member"": ""Archivia membro"", + ""archive-warning"": ""❗ Sei sicuro di voler archiviare {{username}}?"", + ""delete-member"": ""Elimina membro"", + ""delete-warning"": ""❗ Sei sicuro di voler eliminare {{username}}?\n\nQUESTA AZIONE È IRREVERSIBILE❗"" + }, + ""system-section"": { + ""server-name"": ""Nome server"", + ""customize-server"": { + ""title"": ""Personalizza server"", + ""default"": ""Preferinito è Memos"", + ""icon-url"": ""URL icona"", + ""description"": ""Descrizione"", + ""locale"": ""Server Locale"", + ""appearance"": ""Aspetto server"" + }, + ""database-file-size"": ""Dimensione file database"", + ""allow-user-signup"": ""Consenti registrazione utente"", + ""disable-password-login"": ""Disabilita login password"", + ""disable-password-login-warning"": ""Ciò disabiliterà l'accesso tramite password per tutti gli utenti. Non è possibile accedere senza ripristinare questa impostazione nel database se i provider di identità configurati falliscono. Dovrai anche prestare molta attenzione quando rimuovi un provider di identità❗"", + ""disable-password-login-final-warning"": ""Digita \""CONFERMA\"" se sai cosa stai facendo."", + ""enable-password-login"": ""Abilita login password"", + ""enable-password-login-warning"": ""Ciò consentirà l'accesso tramite password per tutti gli utenti. Continua solo se desideri che gli utenti possano accedere utilizzando sia SSO che password❗"", + ""ignore-version-upgrade"": ""Ignora aggiornamento versione"", + ""disable-public-memos"": ""Disabilita memo pubblici"", + ""max-upload-size"": ""Dimensione massima caricamento (MiB)"", + ""max-upload-size-hint"": ""Valore consigliato di 32 MiB."", + ""auto-backup-interval"": ""Intervallo auto backup (secondi)"", + ""auto-backup-interval-hint"": ""Inserire 0 per disattivare backup automatici. È richiesto il riavvio per salvare l'impostazione."", + ""additional-style"": ""Stile aggiuntivo"", + ""additional-script"": ""Script aggiuntivo"", + ""additional-style-placeholder"": ""Codice CSS aggiuntivo"", + ""additional-script-placeholder"": ""Codice JS aggiuntivo"", + ""telegram-bot-token"": ""Token Bot Telegram"", + ""telegram-bot-token-description"": ""Token bot Telegram o API Proxy come `http.../bot`"", + ""telegram-bot-token-placeholder"": ""Il token del tuo bot Telegram"", + ""display-with-updated-time"": ""Mostra con tempo aggiornato"" + }, + ""appearance-option"": { + ""system"": ""Sistema"", + ""light"": ""Sempre chiaro"", + ""dark"": ""Sempre scuro"" + }, + ""sso-section"": { + ""sso-list"": ""Lista SSO"", + ""delete-sso"": ""Elimina SSO"", + ""confirm-delete"": ""Sei sicuro di voler eliminare la configurazione SSO di \""{{name}}\""?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", + ""create-sso"": ""Crea SSO"", + ""update-sso"": ""Aggiorna SSO"", + ""sso-created"": ""Creato SSO {{name}}"", + ""sso-updated"": ""Aggiornato SSO {{name}}"", + ""identifier"": ""Identificatore"", + ""display-name"": ""Nome visualizzato"", + ""template"": ""Template"", + ""custom"": ""Custom"", + ""identifier-filter"": ""Filtro identificatore"", + ""redirect-url"": ""URL reindirizzamento"", + ""client-id"": ""Client ID"", + ""client-secret"": ""Client secret"", + ""authorization-endpoint"": ""Authorization endpoint"", + ""token-endpoint"": ""Token endpoint"", + ""user-endpoint"": ""User endpoint"", + ""scopes"": ""Scopes"", + ""disabled-password-login-warning"": ""Il login con la password è disattivato, sii extra-attento quando elimini SSO❗"" + } }, - ""sso-section"": { - ""sso-list"": ""Lista SSO"", - ""delete-sso"": ""Elimina SSO"", - ""confirm-delete"": ""Sei sicuro di voler eliminare la configurazione SSO di \""{{name}}\""?\n\nQUESTA AZIONE È IRREVERSIBILE❗"", - ""create-sso"": ""Crea SSO"", - ""update-sso"": ""Aggiorna SSO"", - ""sso-created"": ""Creato SSO {{name}}"", - ""sso-updated"": ""Aggiornato SSO {{name}}"", - ""identifier"": ""Identificatore"", - ""display-name"": ""Nome visualizzato"", - ""template"": ""Template"", - ""custom"": ""Custom"", - ""identifier-filter"": ""Filtro identificatore"", - ""redirect-url"": ""URL reindirizzamento"", - ""client-id"": ""Client ID"", - ""client-secret"": ""Client secret"", - ""authorization-endpoint"": ""Authorization endpoint"", - ""token-endpoint"": ""Token endpoint"", - ""user-endpoint"": ""User endpoint"", - ""scopes"": ""Scopes"", - ""disabled-password-login-warning"": ""Il login con la password è disattivato, sii extra-attento quando elimini SSO❗"" - } - }, - ""filter"": { - ""new-filter"": ""Nuovo filtro"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Tipo"", - ""text"": ""Testo"", - ""display-time"": ""Tempo visualizzazione"", - ""visibility"": ""Visibilità"" + ""amount-text"": { + ""memo_one"": ""MEMO"", + ""memo_many"": """", + ""memo_other"": ""MEMOS"" + }, + ""message"": { + ""no-data"": ""Nessun dato"", + ""memos-ready"": ""Tutti i memo sono stati caricati 🎉"", + ""resource-ready"": ""Tutte le risorse sono state caricate 🎉"", + ""restored-successfully"": ""Ripristinato con successo"", + ""memo-updated-datetime"": ""Memo aggiornato con successo"", + ""invalid-created-datetime"": ""Data creazione non valida"", + ""change-memo-created-time"": ""Cambia data creazione"", + ""change-memo-created-time-warning-1"": ""QUESTO NON È UN COMPORTAMENTO PREVISTO."", + ""change-memo-created-time-warning-2"": ""Per favore assicurati di averne effettivamente bisogno"", + ""memo-not-found"": ""Memo non trovato"", + ""fill-all"": ""Per favore riempi tutti i campi"", + ""password-not-match"": ""Le password non corrispondono"", + ""new-password-not-match"": ""Le nuove password non corrispondono"", + ""image-load-failed"": ""Caricamento immagine fallito"", + ""fill-form"": ""Per favore riempi il form"", + ""fill-server-name"": ""Per favore riempi il nome del server"", + ""login-failed"": ""Login fallito"", + ""signup-failed"": ""Registrazione fallita"", + ""user-not-found"": ""Utente non trovato"", + ""password-changed"": ""Password cambiata"", + ""private-only"": ""Questo memo è impostato come privato."", + ""copied"": ""Copiato"", + ""succeed-copy-content"": ""Contenuto copiato."", + ""succeed-copy-code"": ""Codice copiato."", + ""succeed-copy-link"": ""Link copiato."", + ""change-resource-filename"": ""Cambia nome file"", + ""resource-filename-updated"": ""Nome file aggiornato"", + ""invalid-resource-filename"": ""Nome file non valido"", + ""click-to-save-the-image"": ""Clicca per salvare l’immagine"", + ""generating-the-screenshot"": ""Generando screenshot…"", + ""count-selected-resources"": ""Totale selezionato"", + ""succeed-vacuum-database"": ""Database ottimizzato con successo."", + ""succeed-update-additional-style"": ""Stile aggiuntivo aggiornato con successo."", + ""succeed-copy-resource-link"": ""Link risorsa copiato con successo."", + ""succeed-update-customized-profile"": ""Profilo personalizzato aggiornato con successo."", + ""succeed-update-additional-script"": ""Script aggiuntivo aggiornato con successo."", + ""update-succeed"": ""Aggiornato con successo"", + ""page-not-found"": ""404 - Pagina non trovata 😥"", + ""maximum-upload-size-is"": ""La dimensione massima di upload è {{size}} MiB"", + ""file-exceeds-upload-limit-of"": ""Il file supera il limite di upload di {{size}} MiB"", + ""updating-setting-failed"": ""Aggiornamento impostazioni fallito"", + ""password-login-disabled"": ""Il login con la password è disattivato"" }, - ""operator"": { - ""contains"": ""Contiene"", - ""not-contains"": ""Non contiene"", - ""is"": ""È"", - ""is-not"": ""Non è"", - ""before"": ""Prima"", - ""after"": ""Dopo"" + ""days"": { + ""mon"": ""Lun"", + ""tue"": ""Mar"", + ""wed"": ""Mer"", + ""thu"": ""Gio"", + ""fri"": ""Ven"", + ""sat"": ""Sab"", + ""sun"": ""Dom"" }, - ""value"": { - ""not-tagged"": ""Non taggato"", - ""linked"": ""Ha links"", - ""has-attachment"": ""Ha allegati"" + ""embed-memo"": { + ""title"": ""Includi memo"", + ""text"": ""Copia e incolla il codice qui sotto nel tuo blog o sito web."", + ""only-public-supported"": ""* È possibile incorporare solo memo pubblici."", + ""copy"": ""Copia"" }, - ""text-placeholder"": ""Inizia con ^ per usare regex"", - ""and"": ""E"", - ""or"": ""O"" - }, - ""amount-text"": { - ""memo_one"": ""MEMO"", - ""memo_other"": ""MEMOS"", - ""tag_one"": ""TAG"", - ""tag_other"": ""TAGS"", - ""day_one"": ""GIORNO"", - ""day_other"": ""GIORNI"" - }, - ""message"": { - ""no-data"": ""Nessun dato"", - ""memos-ready"": ""Tutti i memo sono stati caricati 🎉"", - ""resource-ready"": ""Tutte le risorse sono state caricate 🎉"", - ""restored-successfully"": ""Ripristinato con successo"", - ""memo-updated-datetime"": ""Memo aggiornato con successo"", - ""invalid-created-datetime"": ""Data creazione non valida"", - ""change-memo-created-time"": ""Cambia data creazione"", - ""change-memo-created-time-warning-1"": ""QUESTO NON È UN COMPORTAMENTO PREVISTO."", - ""change-memo-created-time-warning-2"": ""Per favore assicurati di averne effettivamente bisogno"", - ""memo-not-found"": ""Memo non trovato"", - ""fill-all"": ""Per favore riempi tutti i campi"", - ""password-not-match"": ""Le password non corrispondono"", - ""new-password-not-match"": ""Le nuove password non corrispondono"", - ""image-load-failed"": ""Caricamento immagine fallito"", - ""fill-form"": ""Per favore riempi il form"", - ""fill-server-name"": ""Per favore riempi il nome del server"", - ""login-failed"": ""Login fallito"", - ""signup-failed"": ""Registrazione fallita"", - ""user-not-found"": ""Utente non trovato"", - ""password-changed"": ""Password cambiata"", - ""private-only"": ""Questo memo è impostato come privato."", - ""copied"": ""Copiato"", - ""succeed-copy-content"": ""Contenuto copiato."", - ""succeed-copy-code"": ""Codice copiato."", - ""succeed-copy-link"": ""Link copiato."", - ""change-resource-filename"": ""Cambia nome file"", - ""resource-filename-updated"": ""Nome file aggiornato"", - ""invalid-resource-filename"": ""Nome file non valido"", - ""click-to-save-the-image"": ""Clicca per salvare l’immagine"", - ""generating-the-screenshot"": ""Generando screenshot…"", - ""count-selected-resources"": ""Totale selezionato"", - ""too-short"": ""Troppo corto"", - ""too-long"": ""Troppo lungo"", - ""not-allow-space"": ""Non permettere spazi"", - ""not-allow-chinese"": ""Non permettere caratteri cinesi"", - ""succeed-vacuum-database"": ""Database ottimizzato con successo."", - ""succeed-update-additional-style"": ""Stile aggiuntivo aggiornato con successo."", - ""succeed-copy-resource-link"": ""Link risorsa copiato con successo."", - ""succeed-update-customized-profile"": ""Profilo personalizzato aggiornato con successo."", - ""succeed-update-additional-script"": ""Script aggiuntivo aggiornato con successo."", - ""update-succeed"": ""Aggiornato con successo"", - ""page-not-found"": ""404 - Pagina non trovata 😥"", - ""maximum-upload-size-is"": ""La dimensione massima di upload è {{size}} MiB"", - ""file-exceeds-upload-limit-of"": ""Il file supera il limite di upload di {{size}} MiB"", - ""updating-setting-failed"": ""Aggiornamento impostazioni fallito"", - ""password-login-disabled"": ""Il login con la password è disattivato"" - }, - ""days"": { - ""mon"": ""Lun"", - ""tue"": ""Mar"", - ""wed"": ""Mer"", - ""thu"": ""Gio"", - ""fri"": ""Ven"", - ""sat"": ""Sab"", - ""sun"": ""Dom"" - }, - ""embed-memo"": { - ""title"": ""Includi memo"", - ""text"": ""Copia e incolla il codice qui sotto nel tuo blog o sito web."", - ""only-public-supported"": ""* È possibile incorporare solo memo pubblici."", - ""copy"": ""Copia"" - }, - ""heatmap"": { - ""memo-in"": ""memo in {{period}}"", - ""memos-in"": ""memos in {{period}}"", - ""memo-on"": ""{{amount}} memo il {{date}}"", - ""memos-on"": ""{{amount}} memos il {{date}}"", - ""day"": ""giorno"", - ""days"": ""giorni"" - }, - ""about"": { - ""about-memos"": ""Informazioni su Memos"", - ""memos-description"": ""Memos è un'applicazione per prendere appunti basata sul Web che puoi utilizzare per scrivere, organizzare e condividere appunti."", - ""no-server-description"": ""Nessuna descrizione configurata per questo server."", - ""powered-by"": ""Powered by"", - ""other-projects"": ""Altri progetti"" - } + ""heatmap"": { + ""memo-in"": ""memo in {{period}}"", + ""memos-in"": ""memos in {{period}}"", + ""memo-on"": ""{{amount}} memo il {{date}}"", + ""memos-on"": ""{{amount}} memos il {{date}}"", + ""day"": ""giorno"", + ""days"": ""giorni"" + }, + ""about"": { + ""about-memos"": ""Informazioni su Memos"", + ""memos-description"": ""Memos è un'applicazione per prendere appunti basata sul Web che puoi utilizzare per scrivere, organizzare e condividere appunti."", + ""no-server-description"": ""Nessuna descrizione configurata per questo server."", + ""powered-by"": ""Powered by"", + ""other-projects"": ""Altri progetti"" + } } diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json index ce130f30fab72..d5065fcfb5e21 100644 --- a/web/src/locales/ja.json +++ b/web/src/locales/ja.json @@ -1,412 +1,362 @@ { - ""common"": { - ""memos-slogan"": ""軽量なセルフホスティング型のメモ帳。オープンソースで永久にフリーです。"", - ""about"": ""About"", - ""home"": ""ホーム"", - ""resources"": ""ファイル"", - ""settings"": ""設定"", - ""archived"": ""ゴミ箱"", - ""email"": ""Eメール"", - ""password"": ""パスワード"", - ""avatar"": ""アイコン"", - ""username"": ""ユーザーネーム"", - ""nickname"": ""ニックネーム"", - ""save"": ""保存する"", - ""close"": ""閉じる"", - ""cancel"": ""キャンセル"", - ""create"": ""作成する"", - ""update"": ""上書き"", - ""change"": ""変更"", - ""confirm"": ""確認する"", - ""reset"": ""リセット"", - ""language"": ""言語"", - ""version"": ""バージョン"", - ""pin"": ""ピン"", - ""unpin"": ""ピンを外す"", - ""edit"": ""編集する"", - ""restore"": ""戻す"", - ""delete"": ""削除する"", - ""null"": ""null"", - ""share"": ""シェアする"", - ""archive"": ""アーカイブにする"", - ""basic"": ""基本設定"", - ""admin"": ""管理者設定"", - ""explore"": ""タイムライン"", - ""sign-in"": ""サインイン"", - ""sign-in-with"": ""{{provider}}でサインイン"", - ""or"": ""もしくは"", - ""sign-up"": ""登録"", - ""sign-out"": ""ログアウト"", - ""type"": ""タイプ"", - ""title"": ""タイトル"", - ""filter"": ""フィルター"", - ""filter-period"": ""{{from}}から{{to}}"", - ""tags"": ""タグ"", - ""yourself"": ""あなた自身の"", - ""changed"": ""変更済み"", - ""fold"": ""折りたたむ"", - ""expand"": ""広げる"", - ""image"": ""画像"", - ""link"": ""リンク"", - ""vacuum"": ""空白"", - ""select"": ""選択"", - ""database"": ""データベース"", - ""upload"": ""アップロード"", - ""preview"": ""プレビュー"", - ""rename"": ""リネーム"", - ""clear"": ""クリア"", - ""name"": ""名前"", - ""visibility"": ""公開範囲"", - ""learn-more"": ""もっと詳しく"", - ""beta"": ""ベータ"", - ""new"": ""New"", - ""mark"": ""マーク"", - ""profile"": ""プロファイル"", - ""dialog"": { - ""error"": ""エラー"", - ""help"": ""ヘルプ"", - ""info"": ""info"", - ""success"": ""成功"", - ""warning"": ""警告"" - } - }, - ""router"": { - ""back-to-home"": ""ホームに戻る"" - }, - ""auth"": { - ""signup-as-host"": ""管理者として登録する"", - ""host-tip"": ""管理者として登録されます。"", - ""not-host-tip"": ""もしあなたがアカウントを持っていない場合、サイト管理者に問い合わせてください。"", - ""new-password"": ""新しいパスワード"", - ""repeat-new-password"": ""新しいパスワードを確認(繰り返し)"" - }, - ""editor"": { - ""editing"": ""作成中"", - ""cancel-edit"": ""作成をキャンセルする"", - ""save"": ""保存"", - ""placeholder"": ""今思ったことは..."", - ""only-image-supported"": ""画像のみ対応しています"", - ""cant-empty"": ""空のままでは保存できません"", - ""local"": ""Local"", - ""resources"": ""ファイル"" - }, - ""memo"": { - ""view-detail"": ""詳細を見る"", - ""copy-link"": ""リンクをコピー"", - ""embed"": ""埋め込む"", - ""archived-memos"": ""メモをアーカイブする"", - ""no-archived-memos"": ""アーカイブされたメモはありません。"", - ""fetching-data"": ""取得中..."", - ""fetch-more"": ""クリックしてさらに取得する"", - ""archived-at"": ""アーカイブ:"", - ""search-placeholder"": ""Search memos"", - ""visibility"": { - ""private"": ""非公開"", - ""protected"": ""メンバーに表示"", - ""public"": ""公開メモ"", - ""disabled"": ""公開メモは無効化されています。"" - }, - ""delete-memo"": ""メモを削除する"", - ""delete-confirm"": ""本当に削除しますか？\n\n削除後復元はできません。"" - }, - ""resource"": { - ""no-resources"": ""ファイルはありません。"", - ""fetching-data"": ""データを取得中"", - ""copy-link"": ""リンクをコピー"", - ""reset-link"": ""リンクをリセット"", - ""reset-resource-link"": ""リンクをリセットする"", - ""reset-link-prompt"": ""本当にリンクをリセットしますか？\n実行すると既存のリンクは無効化されます。\n\n実行後、元に戻せません。"", - ""delete-resource"": ""ファイルを削除する"", - ""linked-amount"": ""Linked amount"", - ""warning-text"": ""本当にファイルを削除しますか?\n\n実行すると取り消せません。"", - ""warning-text-unused"": ""本当に未使用のファイルを削除しますか？\n\n実行すると取り消せません。"", - ""no-unused-resources"": ""未使用のファイルはありません。"", - ""delete-selected-resources"": ""ファイルは削除されました。"", - ""no-files-selected"": ""ファイルが選択されていません！"", - ""upload-successfully"": ""アップロードされました"", - ""file-drag-drop-prompt"": ""アップロードするファイルをドラックアンドドロップする"", - ""search-bar-placeholder"": ""ファイルを検索する"", - ""clear"": ""クリア"", - ""create-dialog"": { - ""title"": ""ファイルをアップロード"", - ""upload-method"": ""アップロード方法"", - ""local-file"": { - ""option"": ""PCからアップロード"", - ""choose"": ""ファイルを選択する"" - }, - ""external-link"": { - ""option"": ""リンクからアップロード"", - ""link"": ""リンク"", - ""link-placeholder"": ""https://your.file/link"", - ""file-name"": ""ファイル名"", - ""file-name-placeholder"": ""ファイル名"", + ""common"": { + ""about"": ""About"", + ""home"": ""ホーム"", + ""resources"": ""ファイル"", + ""settings"": ""設定"", + ""archived"": ""ゴミ箱"", + ""email"": ""Eメール"", + ""password"": ""パスワード"", + ""avatar"": ""アイコン"", + ""username"": ""ユーザーネーム"", + ""nickname"": ""ニックネーム"", + ""save"": ""保存する"", + ""close"": ""閉じる"", + ""cancel"": ""キャンセル"", + ""create"": ""作成する"", + ""update"": ""上書き"", + ""change"": ""変更"", + ""confirm"": ""確認する"", + ""reset"": ""リセット"", + ""language"": ""言語"", + ""version"": ""バージョン"", + ""pin"": ""ピン"", + ""unpin"": ""ピンを外す"", + ""edit"": ""編集する"", + ""restore"": ""戻す"", + ""delete"": ""削除する"", + ""null"": ""null"", + ""share"": ""シェアする"", + ""archive"": ""アーカイブにする"", + ""basic"": ""基本設定"", + ""admin"": ""管理者設定"", + ""explore"": ""タイムライン"", + ""sign-in"": ""サインイン"", + ""sign-in-with"": ""{{provider}}でサインイン"", + ""or"": ""もしくは"", + ""sign-up"": ""登録"", + ""sign-out"": ""ログアウト"", ""type"": ""タイプ"", - ""type-placeholder"": ""ファイルタイプ"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""作成するには`#tag`のように入力してください"", - ""create-tag"": ""タグを作成する"", - ""all-tags"": ""すべてのタグ"", - ""tag-name"": ""タグの名前"", - ""invalid-tag-name"": ""無効なタグ名"", - ""tag-suggestions"": ""タグの提案"", - ""show"": ""表示"", - ""hide"": ""非表示"", - ""save-all"": ""すべて保存"" - }, - ""daily-review"": { - ""title"": ""今日のまとめ"", - ""no-memos"": ""あっ...今日はなんも書いてないっスね"" - }, - ""setting"": { - ""my-account"": ""アカウント設定"", - ""preference"": ""設定"", - ""member"": ""メンバー"", - ""member-list"": ""メンバーリスト"", - ""system"": ""システム"", - ""storage"": ""ストレージ"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""アカウント情報"", - ""username-note"": ""ログインに使用します"", - ""nickname-note"": ""表示される名前です"", - ""email-note"": ""オプション"", - ""update-information"": ""プロフィールを編集"", - ""change-password"": ""パスワードを変更"", - ""reset-api"": ""APIをリセットする"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""OpenAPI Keyをリセットする"", - ""openapi-reset-warning"": ""続行すると既存のAPIは無効化され、新しいAPIが発行されます。\n\n本当にリセットしますか？"", - ""openapi-sample-post"": ""{{url}}より、こんにちは！#memos"" + ""title"": ""タイトル"", + ""filter"": ""フィルター"", + ""filter-period"": ""{{from}}から{{to}}"", + ""tags"": ""タグ"", + ""yourself"": ""あなた自身の"", + ""changed"": ""変更済み"", + ""fold"": ""折りたたむ"", + ""expand"": ""広げる"", + ""image"": ""画像"", + ""link"": ""リンク"", + ""vacuum"": ""空白"", + ""select"": ""選択"", + ""database"": ""データベース"", + ""upload"": ""アップロード"", + ""preview"": ""プレビュー"", + ""rename"": ""リネーム"", + ""clear"": ""クリア"", + ""name"": ""名前"", + ""visibility"": ""公開範囲"", + ""learn-more"": ""もっと詳しく"", + ""beta"": ""ベータ"", + ""new"": ""New"", + ""mark"": ""マーク"", + ""profile"": ""プロファイル"" }, - ""preference-section"": { - ""theme"": ""テーマ"", - ""default-memo-visibility"": ""公開範囲の初期設定"", - ""default-resource-visibility"": ""ファイルの保存先の初期設定"", - ""enable-folding-memo"": ""折りたたみメモの有効化"", - ""enable-double-click"": ""ダブルクリックで編集を有効化"", - ""editor-font-style"": ""フォント設定"", - ""mobile-editor-style"": ""モバイルエディターの設定"", - ""default-memo-sort-option"": ""メモの表示時間"", - ""telegram-user-id"": ""TelegramのUserid"", - ""telegram-user-id-placeholder"": ""文章をTelegram Botに送信して取得します。"", - ""created_ts"": ""投稿時間"", - ""updated_ts"": ""編集された時間"", - ""daily-review-time-offset"": ""今日のまとめの設定時差"", - ""auto-collapse"": ""自動で折りたたむ"" + ""auth"": { + ""host-tip"": ""管理者として登録されます。"", + ""new-password"": ""新しいパスワード"", + ""repeat-new-password"": ""新しいパスワードを確認(繰り返し)"" }, - ""storage-section"": { - ""current-storage"": ""現在のストレージ"", - ""type-database"": ""Database"", - ""type-local"": ""Local"", - ""storage-services-list"": ""登録済みのストレージサービス"", - ""create-a-service"": ""ストレージを登録"", - ""update-a-service"": ""ストレージを更新"", - ""warning-text"": ""本当に\""{{name}}\""を消去しますか?\n\n 消去後、元に戻せません！"", - ""delete-storage"": ""ストレージを削除"", - ""local-storage-path"": ""Local storageのパス"", - ""update-local-path"": ""Local Storageのパスを更新"", - ""update-local-path-description"": ""Local storageのパスは、データベースファイルへの相対パスを登録してください。"", - ""create-storage"": ""ストレージを作成"", - ""update-storage"": ""ストレージを更新"", - ""endpoint"": ""Endpoint"", - ""s3-compatible-url"": ""S3 Compatible URL"", - ""region"": ""Region"", - ""region-placeholder"": ""Region name"", - ""accesskey"": ""Access key"", - ""accesskey-placeholder"": ""Access key / Access ID"", - ""secretkey"": ""Secret key"", - ""secretkey-placeholder"": ""Secret key / Access Key"", - ""bucket"": ""Bucket"", - ""bucket-placeholder"": ""Bucket name"", - ""path"": ""Storage Path"", - ""path-description"": ""ローカルストレージから、{filename}のような変数を使用することができます。"", - ""path-placeholder"": ""custom/path"", - ""url-prefix"": ""URL prefix"", - ""url-prefix-placeholder"": ""Custom URL prefix, optional"", - ""url-suffix"": ""URL suffix"", - ""url-suffix-placeholder"": ""Custom URL suffix, optional"" + ""editor"": { + ""editing"": ""作成中"", + ""cancel-edit"": ""作成をキャンセルする"", + ""save"": ""保存"", + ""placeholder"": ""今思ったことは..."", + ""only-image-supported"": ""画像のみ対応しています"", + ""cant-empty"": ""空のままでは保存できません"", + ""local"": ""Local"", + ""resources"": ""ファイル"" }, - ""member-section"": { - ""create-a-member"": ""メンバーを追加する"", - ""archive-member"": ""メンバーをゴミ箱に入れる"", - ""archive-warning"": ""❗本当に{{username}}をゴミ箱に追加していいですか?"", - ""delete-member"": ""メンバーを消去する"", - ""delete-warning"": ""❗本当に{{username}}を消去していいですか?\n\n消去後、元に戻せません"" + ""memo"": { + ""view-detail"": ""詳細を見る"", + ""copy-link"": ""リンクをコピー"", + ""embed"": ""埋め込む"", + ""archived-memos"": ""メモをアーカイブする"", + ""no-archived-memos"": ""アーカイブされたメモはありません。"", + ""fetching-data"": ""取得中..."", + ""fetch-more"": ""クリックしてさらに取得する"", + ""archived-at"": ""アーカイブ:"", + ""search-placeholder"": ""Search memos"", + ""visibility"": { + ""private"": ""非公開"", + ""protected"": ""メンバーに表示"", + ""public"": ""公開メモ"", + ""disabled"": ""公開メモは無効化されています。"" + }, + ""delete-memo"": ""メモを削除する"", + ""delete-confirm"": ""本当に削除しますか？\n\n削除後復元はできません。"" }, - ""system-section"": { - ""server-name"": ""サーバーの名前"", - ""customize-server"": { - ""title"": ""サーバーをカスタマイズ"", - ""default"": ""デフォルトではmemosです"", - ""icon-url"": ""IconのURL"", - ""description"": ""説明"", - ""locale"": ""サーバーの言語"", - ""appearance"": ""サーバーの外観"" - }, - ""database-file-size"": ""データベースのファイルサイズ"", - ""allow-user-signup"": ""ユーザー登録を有効にする"", - ""disable-password-login"": ""パスワードでのログインを無効にする"", - ""disable-password-login-warning"": ""これにより、すべてのユーザーのパスワードでのログインが無効になります。設定済みのIDプロバイダーが失敗した場合、この設定をデータベースで元に戻さない限り、ログインすることはできません。IDプロバイダーを削除する際も、非常に注意が必要です❗"", - ""disable-password-login-final-warning"": ""何をしているか理解している場合は、「CONFIRM」と入力してください。"", - ""enable-password-login"": ""パスワードでのログインを有効にする"", - ""enable-password-login-warning"": ""これにより、すべてのユーザーのパスワードでのログインが有効になります。SSOとパスワードの両方を使用してログインできるようにしたい場合のみ、続行してください❗"", - ""ignore-version-upgrade"": ""アップデートを無効にする"", - ""disable-public-memos"": ""公開メモを無効化する"", - ""max-upload-size"": ""最大ファイルサイズ(MiB)"", - ""max-upload-size-hint"": ""推奨サイズは32 MiBです。"", - ""auto-backup-interval"": ""自動バックアップの間隔（秒）"", - ""auto-backup-interval-hint"": ""自動バックアップを無効にするには0を設定してください。この値を変更した後、再起動が必要です。"", - ""additional-style"": ""追加CSS"", - ""additional-script"": ""追加スクリプト"", - ""additional-style-placeholder"": ""CSSのコードを追加してください。"", - ""additional-script-placeholder"": ""Javascriptのコードを追加してください。"", - ""telegram-bot-token"": ""Telegram Bot Token"", - ""telegram-bot-token-description"": ""Telegram Bot TokenかAPI Proxyを`http.../bot`のように入力してください。"", - ""telegram-bot-token-placeholder"": ""あなたのTelegram Bot token"", - ""display-with-updated-time"": ""更新日時を表示する"" + ""resource"": { + ""no-resources"": ""ファイルはありません。"", + ""fetching-data"": ""データを取得中"", + ""copy-link"": ""リンクをコピー"", + ""reset-link"": ""リンクをリセット"", + ""reset-resource-link"": ""リンクをリセットする"", + ""reset-link-prompt"": ""本当にリンクをリセットしますか？\n実行すると既存のリンクは無効化されます。\n\n実行後、元に戻せません。"", + ""delete-resource"": ""ファイルを削除する"", + ""linked-amount"": ""Linked amount"", + ""warning-text"": ""本当にファイルを削除しますか?\n\n実行すると取り消せません。"", + ""warning-text-unused"": ""本当に未使用のファイルを削除しますか？\n\n実行すると取り消せません。"", + ""no-unused-resources"": ""未使用のファイルはありません。"", + ""delete-selected-resources"": ""ファイルは削除されました。"", + ""no-files-selected"": ""ファイルが選択されていません！"", + ""upload-successfully"": ""アップロードされました"", + ""file-drag-drop-prompt"": ""アップロードするファイルをドラックアンドドロップする"", + ""search-bar-placeholder"": ""ファイルを検索する"", + ""clear"": ""クリア"", + ""create-dialog"": { + ""title"": ""ファイルをアップロード"", + ""upload-method"": ""アップロード方法"", + ""local-file"": { + ""option"": ""PCからアップロード"", + ""choose"": ""ファイルを選択する"" + }, + ""external-link"": { + ""option"": ""リンクからアップロード"", + ""link"": ""リンク"", + ""link-placeholder"": ""https://your.file/link"", + ""file-name"": ""ファイル名"", + ""file-name-placeholder"": ""ファイル名"", + ""type"": ""タイプ"", + ""type-placeholder"": ""ファイルタイプ"" + } + } }, - ""appearance-option"": { - ""system"": ""システム設定に従う"", - ""light"": ""ライトモード"", - ""dark"": ""ダークモード"" + ""tag-list"": { + ""tip-text"": ""作成するには`#tag`のように入力してください"", + ""create-tag"": ""タグを作成する"", + ""all-tags"": ""すべてのタグ"", + ""tag-name"": ""タグの名前"", + ""invalid-tag-name"": ""無効なタグ名"", + ""tag-suggestions"": ""タグの提案"", + ""show"": ""表示"", + ""hide"": ""非表示"", + ""save-all"": ""すべて保存"" }, - ""sso-section"": { - ""sso-list"": ""SSOリスト"", - ""delete-sso"": ""削除を確定"", - ""confirm-delete"": ""本当に\""{{name}}\""のSSO設定を削除してもいいですか?\n\n消去後、元には戻せません。"", - ""create-sso"": ""SSOを作成する"", - ""update-sso"": ""SSOを更新する"", - ""sso-created"": ""SSO {{name}}を作成しました"", - ""sso-updated"": ""SSO {{name}}を更新しました"", - ""identifier"": ""識別子"", - ""display-name"": ""表示名"", - ""template"": ""テンプレート"", - ""custom"": ""カスタム"", - ""identifier-filter"": ""識別子フィルター"", - ""redirect-url"": ""リダイレクトURL"", - ""client-id"": ""Client ID"", - ""client-secret"": ""Client secret"", - ""authorization-endpoint"": ""Authorization endpoint"", - ""token-endpoint"": ""Token endpoint"", - ""user-endpoint"": ""User endpoint"", - ""scopes"": ""Scopes"", - ""disabled-password-login-warning"": ""パスワードによるログインが無効になっていますので、アイデンティティプロバイダーを削除する際は特に注意してください❗"" - } - }, - ""filter"": { - ""new-filter"": ""新しいフィルター"", - ""type"": { - ""tag"": ""タグ"", - ""type"": ""タイプ"", - ""text"": ""テキスト"", - ""display-time"": ""投稿時間"", - ""visibility"": ""公開範囲"" + ""daily-review"": { + ""title"": ""今日のまとめ"", + ""no-memos"": ""あっ...今日はなんも書いてないっスね"" }, - ""operator"": { - ""contains"": ""を含む"", - ""not-contains"": ""を含まない"", - ""is"": ""は"", - ""is-not"": ""ではない"", - ""before"": ""より前"", - ""after"": ""より後"" + ""setting"": { + ""my-account"": ""アカウント設定"", + ""preference"": ""設定"", + ""member"": ""メンバー"", + ""member-list"": ""メンバーリスト"", + ""system"": ""システム"", + ""storage"": ""ストレージ"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""アカウント情報"", + ""username-note"": ""ログインに使用します"", + ""nickname-note"": ""表示される名前です"", + ""email-note"": ""オプション"", + ""update-information"": ""プロフィールを編集"", + ""change-password"": ""パスワードを変更"", + ""reset-api"": ""APIをリセットする"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""OpenAPI Keyをリセットする"", + ""openapi-reset-warning"": ""続行すると既存のAPIは無効化され、新しいAPIが発行されます。\n\n本当にリセットしますか？"", + ""openapi-sample-post"": ""{{url}}より、こんにちは！#memos"" + }, + ""preference-section"": { + ""theme"": ""テーマ"", + ""default-memo-visibility"": ""公開範囲の初期設定"", + ""default-resource-visibility"": ""ファイルの保存先の初期設定"", + ""enable-folding-memo"": ""折りたたみメモの有効化"", + ""enable-double-click"": ""ダブルクリックで編集を有効化"", + ""editor-font-style"": ""フォント設定"", + ""mobile-editor-style"": ""モバイルエディターの設定"", + ""default-memo-sort-option"": ""メモの表示時間"", + ""telegram-user-id"": ""TelegramのUserid"", + ""telegram-user-id-placeholder"": ""文章をTelegram Botに送信して取得します。"", + ""created_ts"": ""投稿時間"", + ""updated_ts"": ""編集された時間"", + ""daily-review-time-offset"": ""今日のまとめの設定時差"", + ""auto-collapse"": ""自動で折りたたむ"" + }, + ""storage-section"": { + ""current-storage"": ""現在のストレージ"", + ""type-database"": ""Database"", + ""type-local"": ""Local"", + ""storage-services-list"": ""登録済みのストレージサービス"", + ""create-a-service"": ""ストレージを登録"", + ""update-a-service"": ""ストレージを更新"", + ""warning-text"": ""本当に\""{{name}}\""を消去しますか?\n\n 消去後、元に戻せません！"", + ""delete-storage"": ""ストレージを削除"", + ""local-storage-path"": ""Local storageのパス"", + ""update-local-path"": ""Local Storageのパスを更新"", + ""update-local-path-description"": ""Local storageのパスは、データベースファイルへの相対パスを登録してください。"", + ""create-storage"": ""ストレージを作成"", + ""update-storage"": ""ストレージを更新"", + ""endpoint"": ""Endpoint"", + ""s3-compatible-url"": ""S3 Compatible URL"", + ""region"": ""Region"", + ""region-placeholder"": ""Region name"", + ""accesskey"": ""Access key"", + ""accesskey-placeholder"": ""Access key / Access ID"", + ""secretkey"": ""Secret key"", + ""secretkey-placeholder"": ""Secret key / Access Key"", + ""bucket"": ""Bucket"", + ""bucket-placeholder"": ""Bucket name"", + ""path"": ""Storage Path"", + ""path-description"": ""ローカルストレージから、{filename}のような変数を使用することができます。"", + ""path-placeholder"": ""custom/path"", + ""url-prefix"": ""URL prefix"", + ""url-prefix-placeholder"": ""Custom URL prefix, optional"", + ""url-suffix"": ""URL suffix"", + ""url-suffix-placeholder"": ""Custom URL suffix, optional"" + }, + ""member-section"": { + ""create-a-member"": ""メンバーを追加する"", + ""archive-member"": ""メンバーをゴミ箱に入れる"", + ""archive-warning"": ""❗本当に{{username}}をゴミ箱に追加していいですか?"", + ""delete-member"": ""メンバーを消去する"", + ""delete-warning"": ""❗本当に{{username}}を消去していいですか?\n\n消去後、元に戻せません"" + }, + ""system-section"": { + ""server-name"": ""サーバーの名前"", + ""customize-server"": { + ""title"": ""サーバーをカスタマイズ"", + ""default"": ""デフォルトではmemosです"", + ""icon-url"": ""IconのURL"", + ""description"": ""説明"", + ""locale"": ""サーバーの言語"", + ""appearance"": ""サーバーの外観"" + }, + ""database-file-size"": ""データベースのファイルサイズ"", + ""allow-user-signup"": ""ユーザー登録を有効にする"", + ""disable-password-login"": ""パスワードでのログインを無効にする"", + ""disable-password-login-warning"": ""これにより、すべてのユーザーのパスワードでのログインが無効になります。設定済みのIDプロバイダーが失敗した場合、この設定をデータベースで元に戻さない限り、ログインすることはできません。IDプロバイダーを削除する際も、非常に注意が必要です❗"", + ""disable-password-login-final-warning"": ""何をしているか理解している場合は、「CONFIRM」と入力してください。"", + ""enable-password-login"": ""パスワードでのログインを有効にする"", + ""enable-password-login-warning"": ""これにより、すべてのユーザーのパスワードでのログインが有効になります。SSOとパスワードの両方を使用してログインできるようにしたい場合のみ、続行してください❗"", + ""ignore-version-upgrade"": ""アップデートを無効にする"", + ""disable-public-memos"": ""公開メモを無効化する"", + ""max-upload-size"": ""最大ファイルサイズ(MiB)"", + ""max-upload-size-hint"": ""推奨サイズは32 MiBです。"", + ""auto-backup-interval"": ""自動バックアップの間隔（秒）"", + ""auto-backup-interval-hint"": ""自動バックアップを無効にするには0を設定してください。この値を変更した後、再起動が必要です。"", + ""additional-style"": ""追加CSS"", + ""additional-script"": ""追加スクリプト"", + ""additional-style-placeholder"": ""CSSのコードを追加してください。"", + ""additional-script-placeholder"": ""Javascriptのコードを追加してください。"", + ""telegram-bot-token"": ""Telegram Bot Token"", + ""telegram-bot-token-description"": ""Telegram Bot TokenかAPI Proxyを`http.../bot`のように入力してください。"", + ""telegram-bot-token-placeholder"": ""あなたのTelegram Bot token"", + ""display-with-updated-time"": ""更新日時を表示する"" + }, + ""appearance-option"": { + ""system"": ""システム設定に従う"", + ""light"": ""ライトモード"", + ""dark"": ""ダークモード"" + }, + ""sso-section"": { + ""sso-list"": ""SSOリスト"", + ""delete-sso"": ""削除を確定"", + ""confirm-delete"": ""本当に\""{{name}}\""のSSO設定を削除してもいいですか?\n\n消去後、元には戻せません。"", + ""create-sso"": ""SSOを作成する"", + ""update-sso"": ""SSOを更新する"", + ""sso-created"": ""SSO {{name}}を作成しました"", + ""sso-updated"": ""SSO {{name}}を更新しました"", + ""identifier"": ""識別子"", + ""display-name"": ""表示名"", + ""template"": ""テンプレート"", + ""custom"": ""カスタム"", + ""identifier-filter"": ""識別子フィルター"", + ""redirect-url"": ""リダイレクトURL"", + ""client-id"": ""Client ID"", + ""client-secret"": ""Client secret"", + ""authorization-endpoint"": ""Authorization endpoint"", + ""token-endpoint"": ""Token endpoint"", + ""user-endpoint"": ""User endpoint"", + ""scopes"": ""Scopes"", + ""disabled-password-login-warning"": ""パスワードによるログインが無効になっていますので、アイデンティティプロバイダーを削除する際は特に注意してください❗"" + } }, - ""value"": { - ""not-tagged"": ""タグはありません"", - ""linked"": ""リンクがあります"", - ""has-attachment"": ""アタッチメントがあります"" + ""message"": { + ""memos-ready"": ""これですべてのメモを閲覧できました🎉"", + ""resource-ready"": ""これですべてのファイルを閲覧できました🎉"", + ""restored-successfully"": ""リストア成功"", + ""memo-updated-datetime"": ""メモの作成日時が変更されました。"", + ""invalid-created-datetime"": ""作成された日付が無効です。"", + ""change-memo-created-time"": ""メモの作成時間が変更されました。"", + ""change-memo-created-time-warning-1"": ""これは正常な動作ではありません"", + ""change-memo-created-time-warning-2"": ""本当に必要かどうか確認してください。"", + ""memo-not-found"": ""メモは見つかりませんでした"", + ""fill-all"": ""すべての項目を入力してください。"", + ""password-not-match"": ""パスワードが一致しません。"", + ""new-password-not-match"": ""新しいパスワードが一致しません"", + ""image-load-failed"": ""画像の読み込みに失敗しました"", + ""fill-form"": ""このフォームに必須事項を入力してください。"", + ""fill-server-name"": ""サーバーの名前を入力してください。"", + ""login-failed"": ""ログイン失敗"", + ""signup-failed"": ""登録失敗"", + ""user-not-found"": ""ユーザーが見つかりませんでした"", + ""password-changed"": ""パスワードを変更しました。"", + ""private-only"": ""このメモは非公開です。"", + ""copied"": ""コピーしました！"", + ""succeed-copy-content"": ""コンテンツのコピーに成功しました"", + ""succeed-copy-code"": ""コードのコピーに成功しました"", + ""succeed-copy-link"": ""リンクのコピーに成功しました"", + ""change-resource-filename"": ""ファイルの名前を変更する"", + ""resource-filename-updated"": ""ファイルの名前を変更しました。"", + ""invalid-resource-filename"": ""無効な名前です。"", + ""click-to-save-the-image"": ""クリックしてこの画像を保存します"", + ""generating-the-screenshot"": ""スクリーンショットを生成中"", + ""count-selected-resources"": ""選択された項目の合計"", + ""succeed-vacuum-database"": ""データベースの初期化に成功しました"", + ""succeed-update-additional-style"": ""追加CSSの保存に成功しました。"", + ""succeed-copy-resource-link"": ""ファイルリンクのコピーに成功しました。"", + ""succeed-update-customized-profile"": ""プロフィール変更の保存に成功しました"", + ""succeed-update-additional-script"": ""追加スクリプトの保存に成功しました"", + ""update-succeed"": ""変更は保存されました。"", + ""page-not-found"": ""404 - ページは見つかりませんでした😥"", + ""maximum-upload-size-is"": ""ファイルの最大サイズは{{size}} MiBです。"", + ""file-exceeds-upload-limit-of"": ""ファイル{{file}}がアップロード制限の{{size}}MiBを超えています。"", + ""updating-setting-failed"": ""設定の更新に失敗しました"", + ""password-login-disabled"": ""パスワードログインが無効の場合、最後のIDプロバイダーを削除することはできません"" }, - ""text-placeholder"": ""^キーでregexを使用できます"", - ""and"": ""かつ"", - ""or"": ""もしくは"" - }, - ""message"": { - ""no-memos"": ""メモはありません🌃"", - ""memos-ready"": ""これですべてのメモを閲覧できました🎉"", - ""no-resource"": ""ファイルはありません🌃"", - ""resource-ready"": ""これですべてのファイルを閲覧できました🎉"", - ""restored-successfully"": ""リストア成功"", - ""memo-updated-datetime"": ""メモの作成日時が変更されました。"", - ""invalid-created-datetime"": ""作成された日付が無効です。"", - ""change-memo-created-time"": ""メモの作成時間が変更されました。"", - ""change-memo-created-time-warning-1"": ""これは正常な動作ではありません"", - ""change-memo-created-time-warning-2"": ""本当に必要かどうか確認してください。"", - ""memo-not-found"": ""メモは見つかりませんでした"", - ""fill-all"": ""すべての項目を入力してください。"", - ""password-not-match"": ""パスワードが一致しません。"", - ""new-password-not-match"": ""新しいパスワードが一致しません"", - ""image-load-failed"": ""画像の読み込みに失敗しました"", - ""fill-form"": ""このフォームに必須事項を入力してください。"", - ""fill-server-name"": ""サーバーの名前を入力してください。"", - ""login-failed"": ""ログイン失敗"", - ""signup-failed"": ""登録失敗"", - ""user-not-found"": ""ユーザーが見つかりませんでした"", - ""password-changed"": ""パスワードを変更しました。"", - ""private-only"": ""このメモは非公開です。"", - ""copied"": ""コピーしました！"", - ""succeed-copy-content"": ""コンテンツのコピーに成功しました"", - ""succeed-copy-code"": ""コードのコピーに成功しました"", - ""succeed-copy-link"": ""リンクのコピーに成功しました"", - ""change-resource-filename"": ""ファイルの名前を変更する"", - ""resource-filename-updated"": ""ファイルの名前を変更しました。"", - ""invalid-resource-filename"": ""無効な名前です。"", - ""click-to-save-the-image"": ""クリックしてこの画像を保存します"", - ""generating-the-screenshot"": ""スクリーンショットを生成中"", - ""count-selected-resources"": ""選択された項目の合計"", - ""too-short"": ""短すぎます"", - ""too-long"": ""長すぎます"", - ""not-allow-space"": ""スペースは入れられません。"", - ""not-allow-chinese"": ""中国語は入力できません。"", - ""succeed-vacuum-database"": ""データベースの初期化に成功しました"", - ""succeed-update-additional-style"": ""追加CSSの保存に成功しました。"", - ""succeed-copy-resource-link"": ""ファイルリンクのコピーに成功しました。"", - ""succeed-update-customized-profile"": ""プロフィール変更の保存に成功しました"", - ""succeed-update-additional-script"": ""追加スクリプトの保存に成功しました"", - ""update-succeed"": ""変更は保存されました。"", - ""page-not-found"": ""404 - ページは見つかりませんでした😥"", - ""maximum-upload-size-is"": ""ファイルの最大サイズは{{size}} MiBです。"", - ""file-exceeds-upload-limit-of"": ""ファイル{{file}}がアップロード制限の{{size}}MiBを超えています。"", - ""updating-setting-failed"": ""設定の更新に失敗しました"", - ""password-login-disabled"": ""パスワードログインが無効の場合、最後のIDプロバイダーを削除することはできません"" - }, - ""amount-text"": { - ""memo_one"": ""MEMO"", - ""memo_other"": ""MEMOS"", - ""tag_one"": ""TAG"", - ""tag_other"": ""TAGS"", - ""day_one"": ""TAG"", - ""day_other"": ""TAGE"" - }, - ""days"": { - ""mon"": ""月"", - ""tue"": ""火"", - ""wed"": ""水"", - ""thu"": ""木"", - ""fri"": ""金"", - ""sat"": ""土"", - ""sun"": ""日"" - }, - ""embed-memo"": { - ""title"": ""メモを埋め込む"", - ""text"": ""コードをあなたのサイズにコピーペーストすればメモを埋め込めます"", - ""only-public-supported"": ""* 公開メモのみ埋め込みできます"", - ""copy"": ""コピー"" - }, - ""heatmap"": { - ""memo-in"": ""{{period}} 個のメモを作成"", - ""memos-in"": ""{{period}} 個のメモを作成"", - ""memo-on"": ""{{date}} に {{amount}} 個のメモを作成"", - ""memos-on"": ""{{date}} に {{amount}} 個のメモを作成"", - ""day"": ""日"", - ""days"": ""日間"" - }, - ""about"": { - ""about-memos"": ""Memos について"", - ""memos-description"": ""Memos は、メモを書き、整理し、共有するために使用できる Web ベースのノートアプリです。"", - ""no-server-description"": ""このサーバーについての説明は設定されていません"", - ""powered-by"": ""Powered by"", - ""other-projects"": ""他のプロジェクト"" - } + ""amount-text"": { + ""memo_other"": ""MEMOS"" + }, + ""days"": { + ""mon"": ""月"", + ""tue"": ""火"", + ""wed"": ""水"", + ""thu"": ""木"", + ""fri"": ""金"", + ""sat"": ""土"", + ""sun"": ""日"" + }, + ""embed-memo"": { + ""title"": ""メモを埋め込む"", + ""text"": ""コードをあなたのサイズにコピーペーストすればメモを埋め込めます"", + ""only-public-supported"": ""* 公開メモのみ埋め込みできます"", + ""copy"": ""コピー"" + }, + ""heatmap"": { + ""memo-in"": ""{{period}} 個のメモを作成"", + ""memos-in"": ""{{period}} 個のメモを作成"", + ""memo-on"": ""{{date}} に {{amount}} 個のメモを作成"", + ""memos-on"": ""{{date}} に {{amount}} 個のメモを作成"", + ""day"": ""日"", + ""days"": ""日間"" + }, + ""about"": { + ""about-memos"": ""Memos について"", + ""memos-description"": ""Memos は、メモを書き、整理し、共有するために使用できる Web ベースのノートアプリです。"", + ""no-server-description"": ""このサーバーについての説明は設定されていません"", + ""powered-by"": ""Powered by"", + ""other-projects"": ""他のプロジェクト"" + } } diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json index 55f8e8aa4ed56..6fe05f5273c7c 100644 --- a/web/src/locales/ko.json +++ b/web/src/locales/ko.json @@ -1,412 +1,358 @@ { - ""common"": { - ""memos-slogan"": ""가볍고 셀프호스팅되는 메모 저장소입니다. 언제나 자유로운 오픈 소스입니다."", - ""about"": ""정보"", - ""home"": ""홈"", - ""resources"": ""리소스"", - ""settings"": ""설정"", - ""archived"": ""보관 목록"", - ""email"": ""이메일"", - ""password"": ""비밀번호"", - ""avatar"": ""아바타"", - ""username"": ""유저네임"", - ""nickname"": ""닉네임"", - ""save"": ""저장"", - ""close"": ""닫기"", - ""cancel"": ""취소"", - ""create"": ""생성"", - ""update"": ""수정"", - ""change"": ""변경"", - ""confirm"": ""확인"", - ""reset"": ""재설정"", - ""language"": ""언어"", - ""version"": ""버전"", - ""pin"": ""고정"", - ""unpin"": ""고정 해제"", - ""edit"": ""편집"", - ""restore"": ""복원"", - ""delete"": ""삭제"", - ""null"": ""비어 있음"", - ""share"": ""공유"", - ""archive"": ""보관 처리"", - ""basic"": ""기본"", - ""admin"": ""관리"", - ""explore"": ""탐색"", - ""sign-in"": ""로그인"", - ""sign-in-with"": ""{{provider}}(으)로 로그인"", - ""or"": ""또는"", - ""sign-up"": ""회원등록"", - ""sign-out"": ""로그아웃"", - ""type"": ""타입"", - ""title"": ""제목"", - ""filter"": ""필터"", - ""filter-period"": ""{{from}} 부터 {{to}}"", - ""tags"": ""태그"", - ""yourself"": ""자기 자신"", - ""changed"": ""변경됨"", - ""fold"": ""접기"", - ""expand"": ""펼치기"", - ""image"": ""이미지"", - ""link"": ""링크"", - ""vacuum"": ""최적화"", - ""select"": ""선택"", - ""database"": ""데이터베이스"", - ""upload"": ""업로드"", - ""preview"": ""미리 보기"", - ""rename"": ""이름 바꾸기"", - ""clear"": ""정리하기"", - ""name"": ""이름"", - ""visibility"": ""공개 범위"", - ""learn-more"": ""더 보기"", - ""beta"": ""베타"", - ""new"": ""신규"", - ""dialog"": { - ""error"": ""오류"", - ""help"": ""도움말"", - ""info"": ""정보"", - ""success"": ""성공"", - ""warning"": ""경고"" + ""common"": { + ""about"": ""정보"", + ""home"": ""홈"", + ""resources"": ""리소스"", + ""settings"": ""설정"", + ""archived"": ""보관 목록"", + ""email"": ""이메일"", + ""password"": ""비밀번호"", + ""avatar"": ""아바타"", + ""username"": ""유저네임"", + ""nickname"": ""닉네임"", + ""save"": ""저장"", + ""close"": ""닫기"", + ""cancel"": ""취소"", + ""create"": ""생성"", + ""update"": ""수정"", + ""change"": ""변경"", + ""confirm"": ""확인"", + ""reset"": ""재설정"", + ""language"": ""언어"", + ""version"": ""버전"", + ""pin"": ""고정"", + ""unpin"": ""고정 해제"", + ""edit"": ""편집"", + ""restore"": ""복원"", + ""delete"": ""삭제"", + ""null"": ""비어 있음"", + ""share"": ""공유"", + ""archive"": ""보관 처리"", + ""basic"": ""기본"", + ""admin"": ""관리"", + ""explore"": ""탐색"", + ""sign-in"": ""로그인"", + ""sign-in-with"": ""{{provider}}(으)로 로그인"", + ""or"": ""또는"", + ""sign-up"": ""회원등록"", + ""sign-out"": ""로그아웃"", + ""type"": ""타입"", + ""title"": ""제목"", + ""filter"": ""필터"", + ""filter-period"": ""{{from}} 부터 {{to}}"", + ""tags"": ""태그"", + ""yourself"": ""자기 자신"", + ""changed"": ""변경됨"", + ""fold"": ""접기"", + ""expand"": ""펼치기"", + ""image"": ""이미지"", + ""link"": ""링크"", + ""vacuum"": ""최적화"", + ""select"": ""선택"", + ""database"": ""데이터베이스"", + ""upload"": ""업로드"", + ""preview"": ""미리 보기"", + ""rename"": ""이름 바꾸기"", + ""clear"": ""정리하기"", + ""name"": ""이름"", + ""visibility"": ""공개 범위"", + ""learn-more"": ""더 보기"", + ""beta"": ""베타"", + ""new"": ""신규"", + ""mark"": ""연결"" }, - ""mark"": ""연결"" - }, - ""router"": { - ""back-to-home"": ""홈으로 돌아가기"" - }, - ""auth"": { - ""signup-as-host"": ""호스트로서 회원등록"", - ""host-tip"": ""사이트 주인으로서의 계정을 등록합니다."", - ""not-host-tip"": ""계정이 없다면 사이트 주인에게 문의해 주세요."", - ""new-password"": ""새 비밀번호"", - ""repeat-new-password"": ""새 비밀번호 재확인"" - }, - ""editor"": { - ""editing"": ""편집 중..."", - ""cancel-edit"": ""편집 취소"", - ""save"": ""저장"", - ""placeholder"": ""떠오르는 게 있나요..."", - ""only-image-supported"": ""이미지 파일만 지원합니다."", - ""cant-empty"": ""내용이 비어있을 수 없음"", - ""local"": ""로컬"", - ""resources"": ""리소스"" - }, - ""memo"": { - ""view-detail"": ""자세히 보기"", - ""copy-link"": ""링크 복사"", - ""embed"": ""임베드"", - ""archived-memos"": ""보관처리된 메모"", - ""no-archived-memos"": ""보관처리된 메모가 없습니다."", - ""fetching-data"": ""불러오는 중..."", - ""fetch-more"": ""더 불러오려면 여기를 누르세요"", - ""archived-at"": ""보관된 날짜"", - ""search-placeholder"": ""메모 검색하기"", - ""visibility"": { - ""private"": ""나만 볼 수 있음"", - ""protected"": ""멤버들만 볼 수 있음"", - ""public"": ""모두가 볼 수 있음"", - ""disabled"": ""공개 메모는 비활성화됨"" + ""auth"": { + ""host-tip"": ""사이트 주인으로서의 계정을 등록합니다."", + ""new-password"": ""새 비밀번호"", + ""repeat-new-password"": ""새 비밀번호 재확인"" }, - ""delete-memo"": ""메모 삭제"", - ""delete-confirm"": ""이 메모를 완전히 삭제하시겠습니까?\n\n이 행동은 되돌릴 수 없습니다❗"" - }, - ""resource"": { - ""no-resources"": ""리소스 없음."", - ""fetching-data"": ""불러오는 중..."", - ""copy-link"": ""링크 복사"", - ""reset-link"": ""링크 초기화"", - ""reset-resource-link"": ""리소스 링크 초기화"", - ""reset-link-prompt"": ""이 리소스의 링크를 초기화하시겠습니까?\n리소스를 링크 형태로 참조하는 모든 곳에서 문제가 생길 수 있습니다.\n\n이 행동은 되돌릴 수 없습니다❗"", - ""delete-resource"": ""리소스 삭제"", - ""linked-amount"": ""연결된 메모 수"", - ""warning-text"": ""이 리소스를 완전히 삭제하시겠습니까? 이 행동은 되돌릴 수 없습니다❗"", - ""warning-text-unused"": ""사용된 적 없는 다음 리소스들을 완전히 삭제하시겠습니까? 이 행동은 되돌릴 수 없습니다❗"", - ""no-unused-resources"": ""사용되지 않는 리소스 없음"", - ""delete-selected-resources"": ""선택된 리소스 삭제"", - ""no-files-selected"": ""파일을 선택하지 않았습니다❗"", - ""upload-successfully"": ""성공적으로 업로드했습니다"", - ""file-drag-drop-prompt"": ""업로드할 파일을 여기에 드래그하세요"", - ""search-bar-placeholder"": ""리소스 검색하기"", - ""clear"": ""Clear"", - ""create-dialog"": { - ""title"": ""리소스 생성"", - ""upload-method"": ""업로드 방법"", - ""local-file"": { - ""option"": ""내 컴퓨터에서"", - ""choose"": ""파일을 선택하세요..."" - }, - ""external-link"": { - ""option"": ""외부 링크에서"", - ""link"": ""링크"", - ""link-placeholder"": ""https://the.link.to/your/resource"", - ""file-name"": ""파일 이름"", - ""file-name-placeholder"": ""파일 이름"", - ""type"": ""종류"", - ""type-placeholder"": ""파일 종류"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""`#태그명`을 입력하세요"", - ""create-tag"": ""태그 생성"", - ""all-tags"": ""모든 태그"", - ""tag-name"": ""TAG_NAME"", - ""invalid-tag-name"": ""잘못된 태그명입니다"" - }, - ""daily-review"": { - ""title"": ""날마다 돌아보기"", - ""no-memos"": ""앗, 아무것도 없네요."" - }, - ""setting"": { - ""my-account"": ""내 계정"", - ""preference"": ""개인 설정"", - ""member"": ""멤버"", - ""member-list"": ""멤버 목록"", - ""system"": ""시스템"", - ""openai"": ""OpenAI"", - ""storage"": ""저장소"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""계정 정보"", - ""username-note"": ""로그인하는 데 사용됨"", - ""nickname-note"": ""배너에 표시됨"", - ""email-note"": ""선택 사항"", - ""update-information"": ""정보 변경"", - ""change-password"": ""비밀번호 변경"", - ""reset-api"": ""API 초기화"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""OpenAPI 키 초기화"", - ""openapi-reset-warning"": ""❗현재 API 키가 완전히 파기되고 새로운 키가 생성됩니다.\n\nAPI 키를 초기화할까요?"", - ""openapi-sample-post"": ""안녕, {{url}} ! #memo"" + ""editor"": { + ""editing"": ""편집 중..."", + ""cancel-edit"": ""편집 취소"", + ""save"": ""저장"", + ""placeholder"": ""떠오르는 게 있나요..."", + ""only-image-supported"": ""이미지 파일만 지원합니다."", + ""cant-empty"": ""내용이 비어있을 수 없음"", + ""local"": ""로컬"", + ""resources"": ""리소스"" }, - ""preference-section"": { - ""theme"": ""테마"", - ""default-memo-visibility"": ""메모 공개 범위 기본값"", - ""default-resource-visibility"": ""리소스 공개 범위 기본값"", - ""enable-folding-memo"": ""메모 접기 활성화"", - ""enable-double-click"": ""더블클릭시 편집 모드 활성화"", - ""editor-font-style"": ""편집기 글꼴 스타일"", - ""mobile-editor-style"": ""모바일 편집기 스타일"", - ""default-memo-sort-option"": ""메모에 표시할 시각"", - ""telegram-user-id"": ""텔레그램 유저 ID"", - ""telegram-user-id-placeholder"": ""서버의 텔레그램 봇에 아무 메세지나 보내서 받을 수 있습니다"", - ""created_ts"": ""생성된 시각"", - ""updated_ts"": ""변경된 시각"", - ""daily-review-time-offset"": ""날마다 돌아보기 기준 시각"", - ""auto-collapse"": ""자동 축소"" + ""memo"": { + ""view-detail"": ""자세히 보기"", + ""copy-link"": ""링크 복사"", + ""embed"": ""임베드"", + ""archived-memos"": ""보관처리된 메모"", + ""no-archived-memos"": ""보관처리된 메모가 없습니다."", + ""fetching-data"": ""불러오는 중..."", + ""fetch-more"": ""더 불러오려면 여기를 누르세요"", + ""archived-at"": ""보관된 날짜"", + ""search-placeholder"": ""메모 검색하기"", + ""visibility"": { + ""private"": ""나만 볼 수 있음"", + ""protected"": ""멤버들만 볼 수 있음"", + ""public"": ""모두가 볼 수 있음"", + ""disabled"": ""공개 메모는 비활성화됨"" + }, + ""delete-memo"": ""메모 삭제"", + ""delete-confirm"": ""이 메모를 완전히 삭제하시겠습니까?\n\n이 행동은 되돌릴 수 없습니다❗"" }, - ""storage-section"": { - ""current-storage"": ""사용 중인 저장소"", - ""type-database"": ""데이터베이스"", - ""type-local"": ""로컬"", - ""storage-services-list"": ""저장소 서비스 목록"", - ""create-a-service"": ""서비스 생성"", - ""update-a-service"": ""서비스 편집"", - ""warning-text"": ""저장소 서비스 \""{{name}}\""을(를) 삭제 하시겠습니까? 이 행동은 되돌릴 수 없습니다❗"", - ""delete-storage"": ""저장소 삭제"", - ""local-storage-path"": ""로컬 저장소 경로"", - ""update-local-path"": ""로컬 저장소 경로 수정"", - ""update-local-path-description"": ""로컬 저장소 경로는 DB 파일으로부터의 상대 경로입니다."", - ""create-storage"": ""저장소 생성"", - ""update-storage"": ""저장소 수정"", - ""endpoint"": ""엔드포인트"", - ""s3-compatible-url"": ""S3과 호환되는 서비스 URL"", - ""region"": ""리전"", - ""region-placeholder"": ""리전 이름"", - ""accesskey"": ""액세스 키"", - ""accesskey-placeholder"": ""액세스 키 / 액세스 ID"", - ""secretkey"": ""비밀 액세스 키"", - ""secretkey-placeholder"": ""비밀 키 / 비밀 액세스 키"", - ""bucket"": ""버킷"", - ""bucket-placeholder"": ""버킷 이름"", - ""path"": ""저장소 경로"", - ""path-description"": ""{filename} 등 로컬 저장소에서와 같은 변수를 사용할 수 있습니다."", - ""path-placeholder"": ""custom/path"", - ""url-prefix"": ""URL 접두사"", - ""url-prefix-placeholder"": ""URL 앞에 붙을 커스텀 접두사, 선택 사항"", - ""url-suffix"": ""URL 접미사"", - ""url-suffix-placeholder"": ""URL 뒤에 붙을 커스텀 접미사, 선택 사항"" + ""resource"": { + ""no-resources"": ""리소스 없음."", + ""fetching-data"": ""불러오는 중..."", + ""copy-link"": ""링크 복사"", + ""reset-link"": ""링크 초기화"", + ""reset-resource-link"": ""리소스 링크 초기화"", + ""reset-link-prompt"": ""이 리소스의 링크를 초기화하시겠습니까?\n리소스를 링크 형태로 참조하는 모든 곳에서 문제가 생길 수 있습니다.\n\n이 행동은 되돌릴 수 없습니다❗"", + ""delete-resource"": ""리소스 삭제"", + ""linked-amount"": ""연결된 메모 수"", + ""warning-text"": ""이 리소스를 완전히 삭제하시겠습니까? 이 행동은 되돌릴 수 없습니다❗"", + ""warning-text-unused"": ""사용된 적 없는 다음 리소스들을 완전히 삭제하시겠습니까? 이 행동은 되돌릴 수 없습니다❗"", + ""no-unused-resources"": ""사용되지 않는 리소스 없음"", + ""delete-selected-resources"": ""선택된 리소스 삭제"", + ""no-files-selected"": ""파일을 선택하지 않았습니다❗"", + ""upload-successfully"": ""성공적으로 업로드했습니다"", + ""file-drag-drop-prompt"": ""업로드할 파일을 여기에 드래그하세요"", + ""search-bar-placeholder"": ""리소스 검색하기"", + ""clear"": ""Clear"", + ""create-dialog"": { + ""title"": ""리소스 생성"", + ""upload-method"": ""업로드 방법"", + ""local-file"": { + ""option"": ""내 컴퓨터에서"", + ""choose"": ""파일을 선택하세요..."" + }, + ""external-link"": { + ""option"": ""외부 링크에서"", + ""link"": ""링크"", + ""link-placeholder"": ""https://the.link.to/your/resource"", + ""file-name"": ""파일 이름"", + ""file-name-placeholder"": ""파일 이름"", + ""type"": ""종류"", + ""type-placeholder"": ""파일 종류"" + } + } }, - ""member-section"": { - ""create-a-member"": ""새 멤버 등록"", - ""archive-member"": ""멤버 보관처리"", - ""archive-warning"": ""❗ 멤버 {{username}} 의 계정을 보관처리하시겠습니까?"", - ""delete-member"": ""멤버 계정 삭제"", - ""delete-warning"": ""❗ 멤버 {{username}} 의 계정을 완전히 삭제하시겠습니까?\n\n이 행동은 되돌릴 수 없습니다❗"" + ""tag-list"": { + ""tip-text"": ""`#태그명`을 입력하세요"", + ""create-tag"": ""태그 생성"", + ""all-tags"": ""모든 태그"", + ""tag-name"": ""TAG_NAME"", + ""invalid-tag-name"": ""잘못된 태그명입니다"" }, - ""system-section"": { - ""server-name"": ""서버 이름"", - ""customize-server"": { - ""title"": ""서버 커스터마이징"", - ""default"": ""기본값은 memos"", - ""icon-url"": ""아이콘 URL"", - ""description"": ""설명"", - ""locale"": ""서버 언어"", - ""appearance"": ""서버 테마"" - }, - ""database-file-size"": ""데이터베이스 파일 크기"", - ""allow-user-signup"": ""회원등록 허용"", - ""disable-password-login"": ""비밀번호 로그인 금지"", - ""disable-password-login-warning"": ""모든 사용자가 비밀번호를 사용해서 로그인하지 못하게 합니다. 설정된 SSO에 문제가 생겼을 경우, 데이터베이스를 직접 조작해서 이 설정을 끄지 않는 한 절대로 로그인하지 못하게 됩니다. SSO 설정을 수정/제거할 때에는 특히 더 조심해 주세요❗"", - ""disable-password-login-final-warning"": ""이로부터 발생할 수 있는 모든 상황을 이해했다면, 아래에 \""CONFIRM\""을 입력해 주세요."", - ""enable-password-login"": ""비밀번호 로그인 허용"", - ""enable-password-login-warning"": ""모든 사용자가 비밀번호를 사용해서 로그인할 수 있게 합니다. 사용자들이 SSO와 비밀번호 둘 다 사용할 수 있게 하고 싶은 경우에만 켜 주세요❗"", - ""ignore-version-upgrade"": ""업그레이드 알림 무시"", - ""disable-public-memos"": ""공개된 메모 금지"", - ""max-upload-size"": ""최대 업로드 크기 (MiB)"", - ""max-upload-size-hint"": ""권장값은 32 MiB입니다."", - ""auto-backup-interval"": ""자동 백업 주기 (초)"", - ""auto-backup-interval-hint"": ""0으로 설정하면 자동 백업을 비활성화합니다. 이 설정을 바꾼 뒤에는 재시작이 필요합니다."", - ""additional-style"": ""추가적인 스타일"", - ""additional-script"": ""추가적인 스크립트"", - ""additional-style-placeholder"": ""추가적인 CSS 코드"", - ""additional-script-placeholder"": ""추가적인 JavaScript 코드"", - ""telegram-bot-token"": ""텔레그램 봇 연동"", - ""telegram-bot-token-description"": ""텔레그램 @BotFather 에서 얻을 수 있습니다"", - ""telegram-bot-token-placeholder"": ""서버의 텔레그램 봇 토큰"", - ""openai-api-key"": ""OpenAI: API 키"", - ""openai-api-key-description"": ""API 키 받아오기"", - ""openai-api-key-placeholder"": ""내 OpenAI API 키"", - ""openai-api-host"": ""OpenAI: API 호스트"", - ""openai-api-host-placeholder"": ""기본값: https://api.openai.com/"", - ""display-with-updated-time"": ""수정된 시각을 표시"" + ""daily-review"": { + ""title"": ""날마다 돌아보기"", + ""no-memos"": ""앗, 아무것도 없네요."" }, - ""appearance-option"": { - ""system"": ""기본값 사용"", - ""light"": ""밝은 테마"", - ""dark"": ""어두운 테마"" + ""setting"": { + ""my-account"": ""내 계정"", + ""preference"": ""개인 설정"", + ""member"": ""멤버"", + ""member-list"": ""멤버 목록"", + ""system"": ""시스템"", + ""storage"": ""저장소"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""계정 정보"", + ""username-note"": ""로그인하는 데 사용됨"", + ""nickname-note"": ""배너에 표시됨"", + ""email-note"": ""선택 사항"", + ""update-information"": ""정보 변경"", + ""change-password"": ""비밀번호 변경"", + ""reset-api"": ""API 초기화"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""OpenAPI 키 초기화"", + ""openapi-reset-warning"": ""❗현재 API 키가 완전히 파기되고 새로운 키가 생성됩니다.\n\nAPI 키를 초기화할까요?"", + ""openapi-sample-post"": ""안녕, {{url}} ! #memo"" + }, + ""preference-section"": { + ""theme"": ""테마"", + ""default-memo-visibility"": ""메모 공개 범위 기본값"", + ""default-resource-visibility"": ""리소스 공개 범위 기본값"", + ""enable-folding-memo"": ""메모 접기 활성화"", + ""enable-double-click"": ""더블클릭시 편집 모드 활성화"", + ""editor-font-style"": ""편집기 글꼴 스타일"", + ""mobile-editor-style"": ""모바일 편집기 스타일"", + ""default-memo-sort-option"": ""메모에 표시할 시각"", + ""telegram-user-id"": ""텔레그램 유저 ID"", + ""telegram-user-id-placeholder"": ""서버의 텔레그램 봇에 아무 메세지나 보내서 받을 수 있습니다"", + ""created_ts"": ""생성된 시각"", + ""updated_ts"": ""변경된 시각"", + ""daily-review-time-offset"": ""날마다 돌아보기 기준 시각"", + ""auto-collapse"": ""자동 축소"" + }, + ""storage-section"": { + ""current-storage"": ""사용 중인 저장소"", + ""type-database"": ""데이터베이스"", + ""type-local"": ""로컬"", + ""storage-services-list"": ""저장소 서비스 목록"", + ""create-a-service"": ""서비스 생성"", + ""update-a-service"": ""서비스 편집"", + ""warning-text"": ""저장소 서비스 \""{{name}}\""을(를) 삭제 하시겠습니까? 이 행동은 되돌릴 수 없습니다❗"", + ""delete-storage"": ""저장소 삭제"", + ""local-storage-path"": ""로컬 저장소 경로"", + ""update-local-path"": ""로컬 저장소 경로 수정"", + ""update-local-path-description"": ""로컬 저장소 경로는 DB 파일으로부터의 상대 경로입니다."", + ""create-storage"": ""저장소 생성"", + ""update-storage"": ""저장소 수정"", + ""endpoint"": ""엔드포인트"", + ""s3-compatible-url"": ""S3과 호환되는 서비스 URL"", + ""region"": ""리전"", + ""region-placeholder"": ""리전 이름"", + ""accesskey"": ""액세스 키"", + ""accesskey-placeholder"": ""액세스 키 / 액세스 ID"", + ""secretkey"": ""비밀 액세스 키"", + ""secretkey-placeholder"": ""비밀 키 / 비밀 액세스 키"", + ""bucket"": ""버킷"", + ""bucket-placeholder"": ""버킷 이름"", + ""path"": ""저장소 경로"", + ""path-description"": ""{filename} 등 로컬 저장소에서와 같은 변수를 사용할 수 있습니다."", + ""path-placeholder"": ""custom/path"", + ""url-prefix"": ""URL 접두사"", + ""url-prefix-placeholder"": ""URL 앞에 붙을 커스텀 접두사, 선택 사항"", + ""url-suffix"": ""URL 접미사"", + ""url-suffix-placeholder"": ""URL 뒤에 붙을 커스텀 접미사, 선택 사항"" + }, + ""member-section"": { + ""create-a-member"": ""새 멤버 등록"", + ""archive-member"": ""멤버 보관처리"", + ""archive-warning"": ""❗ 멤버 {{username}} 의 계정을 보관처리하시겠습니까?"", + ""delete-member"": ""멤버 계정 삭제"", + ""delete-warning"": ""❗ 멤버 {{username}} 의 계정을 완전히 삭제하시겠습니까?\n\n이 행동은 되돌릴 수 없습니다❗"" + }, + ""system-section"": { + ""server-name"": ""서버 이름"", + ""customize-server"": { + ""title"": ""서버 커스터마이징"", + ""default"": ""기본값은 memos"", + ""icon-url"": ""아이콘 URL"", + ""description"": ""설명"", + ""locale"": ""서버 언어"", + ""appearance"": ""서버 테마"" + }, + ""database-file-size"": ""데이터베이스 파일 크기"", + ""allow-user-signup"": ""회원등록 허용"", + ""disable-password-login"": ""비밀번호 로그인 금지"", + ""disable-password-login-warning"": ""모든 사용자가 비밀번호를 사용해서 로그인하지 못하게 합니다. 설정된 SSO에 문제가 생겼을 경우, 데이터베이스를 직접 조작해서 이 설정을 끄지 않는 한 절대로 로그인하지 못하게 됩니다. SSO 설정을 수정/제거할 때에는 특히 더 조심해 주세요❗"", + ""disable-password-login-final-warning"": ""이로부터 발생할 수 있는 모든 상황을 이해했다면, 아래에 \""CONFIRM\""을 입력해 주세요."", + ""enable-password-login"": ""비밀번호 로그인 허용"", + ""enable-password-login-warning"": ""모든 사용자가 비밀번호를 사용해서 로그인할 수 있게 합니다. 사용자들이 SSO와 비밀번호 둘 다 사용할 수 있게 하고 싶은 경우에만 켜 주세요❗"", + ""ignore-version-upgrade"": ""업그레이드 알림 무시"", + ""disable-public-memos"": ""공개된 메모 금지"", + ""max-upload-size"": ""최대 업로드 크기 (MiB)"", + ""max-upload-size-hint"": ""권장값은 32 MiB입니다."", + ""auto-backup-interval"": ""자동 백업 주기 (초)"", + ""auto-backup-interval-hint"": ""0으로 설정하면 자동 백업을 비활성화합니다. 이 설정을 바꾼 뒤에는 재시작이 필요합니다."", + ""additional-style"": ""추가적인 스타일"", + ""additional-script"": ""추가적인 스크립트"", + ""additional-style-placeholder"": ""추가적인 CSS 코드"", + ""additional-script-placeholder"": ""추가적인 JavaScript 코드"", + ""telegram-bot-token"": ""텔레그램 봇 연동"", + ""telegram-bot-token-description"": ""텔레그램 @BotFather 에서 얻을 수 있습니다"", + ""telegram-bot-token-placeholder"": ""서버의 텔레그램 봇 토큰"", + ""display-with-updated-time"": ""수정된 시각을 표시"" + }, + ""appearance-option"": { + ""system"": ""기본값 사용"", + ""light"": ""밝은 테마"", + ""dark"": ""어두운 테마"" + }, + ""sso-section"": { + ""sso-list"": ""SSO 목록"", + ""delete-sso"": ""삭제 확인"", + ""confirm-delete"": ""SSO 설정 \""{{name}}\""을 완전히 삭제하시겠습니까?\n\n이 행동은 되돌릴 수 없습니다❗"", + ""create-sso"": ""SSO 생성"", + ""update-sso"": ""SSO 수정"", + ""sso-created"": ""SSO {{name}}이 생성되었습니다"", + ""sso-updated"": ""SSO {{name}}이 수정되었습니다"", + ""identifier"": ""식별자"", + ""display-name"": ""보여줄 이름"", + ""template"": ""간편 설정"", + ""custom"": ""사용자 지정"", + ""identifier-filter"": ""식별자 필터"", + ""redirect-url"": ""리다이렉트 URL"", + ""client-id"": ""클라이언트 ID"", + ""client-secret"": ""클라이언트 비밀키"", + ""authorization-endpoint"": ""인증 엔드포인트"", + ""token-endpoint"": ""토큰 엔드포인트"", + ""user-endpoint"": ""유저 엔드포인트"", + ""scopes"": ""스코프"", + ""disabled-password-login-warning"": ""비밀번호 로그인이 비활성화되어 있습니다. SSO를 지울 때는 더 조심하세요❗"" + } }, - ""sso-section"": { - ""sso-list"": ""SSO 목록"", - ""delete-sso"": ""삭제 확인"", - ""confirm-delete"": ""SSO 설정 \""{{name}}\""을 완전히 삭제하시겠습니까?\n\n이 행동은 되돌릴 수 없습니다❗"", - ""create-sso"": ""SSO 생성"", - ""update-sso"": ""SSO 수정"", - ""sso-created"": ""SSO {{name}}이 생성되었습니다"", - ""sso-updated"": ""SSO {{name}}이 수정되었습니다"", - ""identifier"": ""식별자"", - ""display-name"": ""보여줄 이름"", - ""template"": ""간편 설정"", - ""custom"": ""사용자 지정"", - ""identifier-filter"": ""식별자 필터"", - ""redirect-url"": ""리다이렉트 URL"", - ""client-id"": ""클라이언트 ID"", - ""client-secret"": ""클라이언트 비밀키"", - ""authorization-endpoint"": ""인증 엔드포인트"", - ""token-endpoint"": ""토큰 엔드포인트"", - ""user-endpoint"": ""유저 엔드포인트"", - ""scopes"": ""스코프"", - ""disabled-password-login-warning"": ""비밀번호 로그인이 비활성화되어 있습니다. SSO를 지울 때는 더 조심하세요❗"" - } - }, - ""filter"": { - ""new-filter"": ""새 필터"", - ""type"": { - ""tag"": ""태그"", - ""type"": ""종류"", - ""text"": ""내용"", - ""display-time"": ""표시 시각"", - ""visibility"": ""공개 범위"" + ""amount-text"": { + ""memo_other"": ""MEMOS"" }, - ""operator"": { - ""contains"": ""포함"", - ""not-contains"": ""비포함"", - ""is"": ""해당"", - ""is-not"": ""비해당"", - ""before"": ""이전"", - ""after"": ""이후"" + ""message"": { + ""no-data"": ""데이터가 없습니다."", + ""memos-ready"": ""모든 메모가 준비되었습니다 🎉"", + ""resource-ready"": ""모든 리소스가 준비되었습니다 🎉"", + ""restored-successfully"": ""성공적으로 복구했습니다"", + ""memo-updated-datetime"": ""메모 생성 시각이 변경되었습니다."", + ""invalid-created-datetime"": ""생성 시각이 올바르지 않습니다."", + ""change-memo-created-time"": ""메모 생성 시각 변경"", + ""change-memo-created-time-warning-1"": ""일반적인 작업이 아닙니다!"", + ""change-memo-created-time-warning-2"": ""진짜 정말로 필요할 때에만 사용해 주세요."", + ""memo-not-found"": ""메모를 찾을 수 없습니다."", + ""fill-all"": ""모든 칸을 채워 주세요."", + ""password-not-match"": ""비밀번호가 맞지 않습니다."", + ""new-password-not-match"": ""새 비밀번호가 서로 맞지 않습니다."", + ""image-load-failed"": ""이미지를 불러오지 못했습니다"", + ""fill-form"": ""이 칸들을 채워 주세요"", + ""fill-server-name"": ""서버 이름을 적어주세요"", + ""login-failed"": ""로그인 실패"", + ""signup-failed"": ""회원등록 실패"", + ""user-not-found"": ""회원을 찾을 수 없습니다"", + ""password-changed"": ""비밀번호를 변경했습니다"", + ""private-only"": ""이 메모는 비공개 전용입니다."", + ""copied"": ""복사했습니다"", + ""succeed-copy-content"": ""내용을 클립보드에 복사했습니다."", + ""succeed-copy-code"": ""코드를 클립보드에 복사했습니다."", + ""succeed-copy-link"": ""링크를 클립보드에 복사했습니다."", + ""change-resource-filename"": ""리소스 파일명 변경"", + ""resource-filename-updated"": ""리소스 파일명을 변경했습니다."", + ""invalid-resource-filename"": ""올바르지 않은 파일명입니다."", + ""click-to-save-the-image"": ""이미지를 저장하려면 클릭하세요"", + ""generating-the-screenshot"": ""스크린샷을 생성하는 중..."", + ""count-selected-resources"": ""선택된 항목"", + ""succeed-vacuum-database"": ""데이터베이스 최적화 성공"", + ""succeed-update-additional-style"": ""추가적인 스타일 적용 성공"", + ""succeed-copy-resource-link"": ""리소스 링크 복사 성공"", + ""succeed-update-customized-profile"": ""프로필 정보 적용 성공"", + ""succeed-update-additional-script"": ""추가적인 스크립트 적용 성공"", + ""update-succeed"": ""업데이트 성공"", + ""page-not-found"": ""404 - 페이지를 찾을 수 없습니다 😥"", + ""maximum-upload-size-is"": ""업로드 최대 크기는 {{size}} MiB입니다"", + ""file-exceeds-upload-limit-of"": ""파일 {{file}}의 크기가 최대 크기인 {{size}} MiB를 넘습니다"", + ""updating-setting-failed"": ""설정을 업데이트하지 못했습니다."", + ""password-login-disabled"": ""비밀번호 로그인이 비활성화되어 있으면 마지막으로 남은 SSO를 삭제할 수 없습니다."" }, - ""value"": { - ""not-tagged"": ""태그 없음"", - ""linked"": ""링크 있음"", - ""has-attachment"": ""첨부파일 있음"" + ""days"": { + ""mon"": ""월"", + ""tue"": ""화"", + ""wed"": ""수"", + ""thu"": ""목"", + ""fri"": ""금"", + ""sat"": ""토"", + ""sun"": ""일"" }, - ""text-placeholder"": ""^으로 시작하면 정규식 취급"", - ""and"": ""그리고"", - ""or"": ""또는"" - }, - ""amount-text"": { - ""memo_one"": ""MEMO"", - ""memo_other"": ""MEMOS"", - ""tag_one"": ""TAG"", - ""tag_other"": ""TAGS"", - ""day_one"": ""TAG"", - ""day_other"": ""TAGE"" - }, - ""message"": { - ""no-data"": ""데이터가 없습니다."", - ""memos-ready"": ""모든 메모가 준비되었습니다 🎉"", - ""resource-ready"": ""모든 리소스가 준비되었습니다 🎉"", - ""restored-successfully"": ""성공적으로 복구했습니다"", - ""memo-updated-datetime"": ""메모 생성 시각이 변경되었습니다."", - ""invalid-created-datetime"": ""생성 시각이 올바르지 않습니다."", - ""change-memo-created-time"": ""메모 생성 시각 변경"", - ""change-memo-created-time-warning-1"": ""일반적인 작업이 아닙니다!"", - ""change-memo-created-time-warning-2"": ""진짜 정말로 필요할 때에만 사용해 주세요."", - ""memo-not-found"": ""메모를 찾을 수 없습니다."", - ""fill-all"": ""모든 칸을 채워 주세요."", - ""password-not-match"": ""비밀번호가 맞지 않습니다."", - ""new-password-not-match"": ""새 비밀번호가 서로 맞지 않습니다."", - ""image-load-failed"": ""이미지를 불러오지 못했습니다"", - ""fill-form"": ""이 칸들을 채워 주세요"", - ""fill-server-name"": ""서버 이름을 적어주세요"", - ""login-failed"": ""로그인 실패"", - ""signup-failed"": ""회원등록 실패"", - ""user-not-found"": ""회원을 찾을 수 없습니다"", - ""password-changed"": ""비밀번호를 변경했습니다"", - ""private-only"": ""이 메모는 비공개 전용입니다."", - ""copied"": ""복사했습니다"", - ""succeed-copy-content"": ""내용을 클립보드에 복사했습니다."", - ""succeed-copy-code"": ""코드를 클립보드에 복사했습니다."", - ""succeed-copy-link"": ""링크를 클립보드에 복사했습니다."", - ""change-resource-filename"": ""리소스 파일명 변경"", - ""resource-filename-updated"": ""리소스 파일명을 변경했습니다."", - ""invalid-resource-filename"": ""올바르지 않은 파일명입니다."", - ""click-to-save-the-image"": ""이미지를 저장하려면 클릭하세요"", - ""generating-the-screenshot"": ""스크린샷을 생성하는 중..."", - ""count-selected-resources"": ""선택된 항목"", - ""too-short"": ""너무 짧음"", - ""too-long"": ""너무 긺"", - ""not-allow-space"": ""공백 허용하지 않음"", - ""not-allow-chinese"": ""한자 허용하지 않음"", - ""succeed-vacuum-database"": ""데이터베이스 최적화 성공"", - ""succeed-update-additional-style"": ""추가적인 스타일 적용 성공"", - ""succeed-copy-resource-link"": ""리소스 링크 복사 성공"", - ""succeed-update-customized-profile"": ""프로필 정보 적용 성공"", - ""succeed-update-additional-script"": ""추가적인 스크립트 적용 성공"", - ""update-succeed"": ""업데이트 성공"", - ""page-not-found"": ""404 - 페이지를 찾을 수 없습니다 😥"", - ""maximum-upload-size-is"": ""업로드 최대 크기는 {{size}} MiB입니다"", - ""file-exceeds-upload-limit-of"": ""파일 {{file}}의 크기가 최대 크기인 {{size}} MiB를 넘습니다"", - ""updating-setting-failed"": ""설정을 업데이트하지 못했습니다."", - ""password-login-disabled"": ""비밀번호 로그인이 비활성화되어 있으면 마지막으로 남은 SSO를 삭제할 수 없습니다."" - }, - ""days"": { - ""mon"": ""월"", - ""tue"": ""화"", - ""wed"": ""수"", - ""thu"": ""목"", - ""fri"": ""금"", - ""sat"": ""토"", - ""sun"": ""일"" - }, - ""embed-memo"": { - ""title"": ""메모 임베드"", - ""text"": ""아래 코드를 블로그나 웹사이트에 붙여넣으세요."", - ""only-public-supported"": ""* 공개 메모만 지원됩니다."", - ""copy"": ""복사"" - }, - ""heatmap"": { - ""memo-in"": ""개 메모를"", - ""memos-in"": ""개 메모를"", - ""memo-on"": ""{{date}} - 메모 {{amount}}개"", - ""memos-on"": ""{{date}} - 메모 {{amount}}개"", - ""day"": ""일간 작성"", - ""days"": ""일간 작성"" - }, - ""about"": { - ""about-memos"": ""Memos에 대해서"", - ""memos-description"": ""Memos는 노트를 쓰고 공유하는 웹 기반의 노트 기록 플랫폼입니다."", - ""no-server-description"": ""서버 설명이 없습니다."", - ""powered-by"": ""제공: "", - ""other-projects"": ""다른 프로젝트"" - } + ""embed-memo"": { + ""title"": ""메모 임베드"", + ""text"": ""아래 코드를 블로그나 웹사이트에 붙여넣으세요."", + ""only-public-supported"": ""* 공개 메모만 지원됩니다."", + ""copy"": ""복사"" + }, + ""heatmap"": { + ""memo-in"": ""개 메모를"", + ""memos-in"": ""개 메모를"", + ""memo-on"": ""{{date}} - 메모 {{amount}}개"", + ""memos-on"": ""{{date}} - 메모 {{amount}}개"", + ""day"": ""일간 작성"", + ""days"": ""일간 작성"" + }, + ""about"": { + ""about-memos"": ""Memos에 대해서"", + ""memos-description"": ""Memos는 노트를 쓰고 공유하는 웹 기반의 노트 기록 플랫폼입니다."", + ""no-server-description"": ""서버 설명이 없습니다."", + ""powered-by"": ""제공: "", + ""other-projects"": ""다른 프로젝트"" + } } diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json index 4f8428a5da6d9..a941ed7acd20a 100644 --- a/web/src/locales/nl.json +++ b/web/src/locales/nl.json @@ -1,370 +1,326 @@ { - ""common"": { - ""about"": ""Over"", - ""home"": ""Home"", - ""resources"": ""Bronnen"", - ""settings"": ""Instellingen"", - ""archived"": ""Gearchiveerd"", - ""email"": ""E-mailadres"", - ""password"": ""Wachtwoord"", - ""avatar"": ""Avatar"", - ""new-password"": ""Nieuw wachtwoord"", - ""repeat-new-password"": ""Nieuw wachtwoord herhalen"", - ""username"": ""Gebruikersnaam"", - ""nickname"": ""Bijnaam"", - ""save"": ""Opslaan"", - ""close"": ""Sluiten"", - ""cancel"": ""Annuleren"", - ""create"": ""Aanmaken"", - ""change"": ""Wijzigen"", - ""confirm"": ""Bevestigen"", - ""reset"": ""Herstel"", - ""language"": ""Taal"", - ""version"": ""Versie"", - ""pin"": ""Vastzetten"", - ""unpin"": ""Losmaken"", - ""edit"": ""Bewerken"", - ""restore"": ""Terugzetten"", - ""delete"": ""Verwijderen"", - ""null"": ""Null"", - ""share"": ""Delen"", - ""archive"": ""Archiveren"", - ""basic"": ""Simpel"", - ""admin"": ""Admin"", - ""explore"": ""Ontdekken"", - ""sign-in"": ""Inloggen"", - ""sign-up"": ""Registreren"", - ""sign-out"": ""Uitloggen"", - ""back-to-home"": ""Terug naar homepagina"", - ""type"": ""Type"", - ""title"": ""Titel"", - ""filter"": ""Filter"", - ""tags"": ""Labels"", - ""yourself"": ""Jijzelf"", - ""archived-at"": ""Gearchiveerd op"", - ""changed"": ""gewijzigd"", - ""update-on"": ""Update op"", - ""fold"": ""Inklappen"", - ""expand"": ""Uitklappen"", - ""vacuum"": ""Optimaliseren"", - ""repeat-password-short"": ""Herhaal"", - ""repeat-password"": ""Herhaal wachtwoord"", - ""image"": ""Afbeelding"", - ""link"": ""Link"", - ""select"": ""Selecteer"", - ""database"": ""Database"", - ""dialog"": { - ""error"": ""Fout"", - ""help"": ""Help"", - ""info"": ""Informatie"", - ""success"": ""Gelukt"", - ""warning"": ""Waarschuwing"" + ""common"": { + ""about"": ""Over"", + ""home"": ""Home"", + ""resources"": ""Bronnen"", + ""settings"": ""Instellingen"", + ""archived"": ""Gearchiveerd"", + ""email"": ""E-mailadres"", + ""password"": ""Wachtwoord"", + ""avatar"": ""Avatar"", + ""username"": ""Gebruikersnaam"", + ""nickname"": ""Bijnaam"", + ""save"": ""Opslaan"", + ""close"": ""Sluiten"", + ""cancel"": ""Annuleren"", + ""create"": ""Aanmaken"", + ""change"": ""Wijzigen"", + ""confirm"": ""Bevestigen"", + ""reset"": ""Herstel"", + ""language"": ""Taal"", + ""version"": ""Versie"", + ""pin"": ""Vastzetten"", + ""unpin"": ""Losmaken"", + ""edit"": ""Bewerken"", + ""restore"": ""Terugzetten"", + ""delete"": ""Verwijderen"", + ""null"": ""Null"", + ""share"": ""Delen"", + ""archive"": ""Archiveren"", + ""basic"": ""Simpel"", + ""admin"": ""Admin"", + ""explore"": ""Ontdekken"", + ""sign-in"": ""Inloggen"", + ""sign-up"": ""Registreren"", + ""sign-out"": ""Uitloggen"", + ""type"": ""Type"", + ""title"": ""Titel"", + ""filter"": ""Filter"", + ""tags"": ""Labels"", + ""yourself"": ""Jijzelf"", + ""changed"": ""gewijzigd"", + ""fold"": ""Inklappen"", + ""expand"": ""Uitklappen"", + ""vacuum"": ""Optimaliseren"", + ""image"": ""Afbeelding"", + ""link"": ""Link"", + ""select"": ""Selecteer"", + ""database"": ""Database"", + ""mark"": ""Citeren"", + ""preview"": ""Voorbeeld"", + ""name"": ""Naam"", + ""beta"": ""Beta"", + ""upload"": ""Uploaden"", + ""update"": ""Bijwerken"", + ""visibility"": ""Zichtbaarheid"", + ""clear"": ""Leegmaken"", + ""rename"": ""Hernoemen"", + ""learn-more"": ""Lees meer"", + ""new"": ""Nieuw"", + ""or"": ""of"", + ""filter-period"": ""{{from}} tot {{to}}"", + ""sign-in-with"": ""Log in met {{provider}}"", + ""profile"": ""Profiel"" }, - ""mark"": ""Citeren"" - }, - ""auth"": { - ""signup-as-host"": ""Registreren als Host"", - ""host-tip"": ""Je registreert je als Site Host."", - ""not-host-tip"": ""Als je geen account hebt, neem dan contact op met de site host."", - ""new-password"": ""Nieuw wachtwoord"", - ""repeat-new-password"": ""Nieuw wachtwoord herhalen"" - }, - ""sidebar"": { - ""daily-review"": ""Dagelijkse Review"", - ""resources"": ""Bronnen"", - ""setting"": ""Instellingen"", - ""archived"": ""Gearchiveerd"" - }, - ""resource"": { - ""description"": ""Bekijk je statische bronnen in memos, zoals foto's."", - ""no-resources"": ""Geen bronnen."", - ""fetching-data"": ""data aan het ophalen..."", - ""upload"": ""Uploaden"", - ""preview"": ""Voorbeeld"", - ""copy-link"": ""Kopieer Link"", - ""delete-resource"": ""Bron verwijderen"", - ""warning-text"": ""Weet je zeker dat je deze bron wilt verwijderen? Deze actie is NIET terug te draaien!"", - ""linked-amount"": ""Aantal gelinkte memo's"", - ""rename"": ""Hernoemen"", - ""warning-text-unused"": ""Weet je zeker dat je deze ongebruikte bron wilt verwijderen? Deze actie is NIET terug te draaien!"", - ""no-unused-resources"": ""Geen ongebruikte bronnen"", - ""name"": ""Name"", - ""clear"": ""Opruimen"" - }, - ""archived"": { - ""archived-memos"": ""Gearchiveerde Memos"", - ""no-archived-memos"": ""Geen gearchiveerde memos."", - ""fetching-data"": ""data aan het ophalen..."" - }, - ""editor"": { - ""editing"": ""Aan het bewerken..."", - ""cancel-edit"": ""Annuleer bewerking"", - ""save"": ""Opslaan"", - ""placeholder"": ""Leeg je gedachten..."", - ""only-image-supported"": ""Alleen afbeeldingen worden ondersteund."", - ""cant-empty"": ""Inhoud kan niet leeg zijn"", - ""local"": ""Lokaal"", - ""resources"": ""Bronnen"" - }, - ""memo"": { - ""view-detail"": ""Bekijk details"", - ""copy"": ""Kopieer"", - ""copy-link"": ""Kopieer link"", - ""search-placeholder"": ""Zoek memos"", - ""fetching-data"": ""data aan het ophalen..."", - ""fetch-more"": ""Klik hier om meer op te halen"", - ""visibility"": { - ""private"": ""Privé"", - ""protected"": ""Zichtbaar voor gebruikers"", - ""public"": ""Openbaar"", - ""disabled"": ""Openbare memos zijn uitgezet"" + ""auth"": { + ""host-tip"": ""Je registreert je als Site Host."", + ""new-password"": ""Nieuw wachtwoord"", + ""repeat-new-password"": ""Nieuw wachtwoord herhalen"", + ""create-your-account"": ""Maak je account"", + ""sign-up-tip"": ""Nog geen account?"", + ""sign-in-tip"": ""Al een account?"" }, - ""delete-memo"": ""Memo verwijderen"", - ""delete-confirm"": ""Weet je zeker dat je deze memo wilt verwijderen?\n\nDit kan niet teruggedraaid worden!"" - }, - ""filter"": { - ""new-filter"": ""Nieuw Filter"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Type"", - ""text"": ""Text"", - ""display-time"": ""Display Time"", - ""visibility"": ""Visibility"" + ""resource"": { + ""no-resources"": ""Geen bronnen."", + ""fetching-data"": ""data aan het ophalen..."", + ""copy-link"": ""Kopieer Link"", + ""delete-resource"": ""Bron verwijderen"", + ""warning-text"": ""Weet je zeker dat je deze bron wilt verwijderen? Deze actie is NIET terug te draaien!"", + ""linked-amount"": ""Aantal gelinkte memo's"", + ""warning-text-unused"": ""Weet je zeker dat je deze ongebruikte bron wilt verwijderen? Deze actie is NIET terug te draaien!"", + ""no-unused-resources"": ""Geen ongebruikte bronnen"", + ""clear"": ""Opruimen"", + ""reset-resource-link"": ""Link resetten"", + ""reset-link"": ""Link resetten"" }, - ""operator"": { - ""contains"": ""Bevat"", - ""not-contains"": ""Bevat niet"", - ""is"": ""Is"", - ""is-not"": ""Is Niet"", - ""before"": ""Voor"", - ""after"": ""Na"" + ""editor"": { + ""editing"": ""Aan het bewerken..."", + ""cancel-edit"": ""Annuleer bewerking"", + ""save"": ""Opslaan"", + ""placeholder"": ""Leeg je gedachten..."", + ""only-image-supported"": ""Alleen afbeeldingen worden ondersteund."", + ""cant-empty"": ""Inhoud kan niet leeg zijn"", + ""local"": ""Lokaal"", + ""resources"": ""Bronnen"" }, - ""value"": { - ""not-tagged"": ""Geen labels"", - ""linked"": ""Heeft links"" + ""memo"": { + ""view-detail"": ""Bekijk details"", + ""copy-link"": ""Kopieer link"", + ""search-placeholder"": ""Zoek memos"", + ""fetching-data"": ""data aan het ophalen..."", + ""fetch-more"": ""Klik hier om meer op te halen"", + ""visibility"": { + ""private"": ""Privé"", + ""protected"": ""Werkruimte"", + ""public"": ""Openbaar"", + ""disabled"": ""Openbare memos zijn uitgezet"" + }, + ""delete-memo"": ""Memo verwijderen"", + ""delete-confirm"": ""Weet je zeker dat je deze memo wilt verwijderen?\n\nDit kan niet teruggedraaid worden!"", + ""embed"": ""Insluiten"", + ""archived-memos"": ""Gearchiveerde memos"", + ""archived-at"": ""Gearchiveerd op"", + ""comment"": { + ""no-comment"": ""Geen opmerking"", + ""self"": ""Opmerkingen"" + }, + ""no-archived-memos"": ""Geen gearchiveerde memos."" }, - ""text-placeholder"": ""Begin met ^ om RegEx te gebruiken."" - }, - ""tag-list"": { - ""tip-text"": ""Typ `#label` om aan te maken"", - ""create-tag"": ""Label maken"", - ""all-tags"": ""Alle labels"", - ""tag-name"": ""LABEL_NAAM"", - ""invalid-tag-name"": ""Onjuiste label naam"" - }, - ""daily-review"": { - ""title"": ""Dagelijks"", - ""no-memos"": ""Oeps, er is niks."" - }, - ""search"": { - ""quickly-filter"": ""Snel filteren"" - }, - ""setting"": { - ""my-account"": ""Mijn account"", - ""preference"": ""Voorkeuren"", - ""member"": ""Gebruikers"", - ""member-list"": ""Gebruikers"", - ""system"": ""Systeem"", - ""account-section"": { - ""title"": ""Accountinformatie"", - ""update-information"": ""Informatie wijzigen"", - ""change-password"": ""Wachtwoord wijzigen"" + ""tag-list"": { + ""tip-text"": ""Typ `#label` om aan te maken"", + ""create-tag"": ""Label maken"", + ""all-tags"": ""Alle labels"", + ""tag-name"": ""LABEL_NAAM"", + ""invalid-tag-name"": ""Onjuiste label naam"" }, - ""preference-section"": { - ""theme"": ""Thema"", - ""default-memo-visibility"": ""Standaard memo zichtbaarheid"", - ""enable-folding-memo"": ""Vouwende memo aanzetten"", - ""editor-font-style"": ""Editor lettertype"", - ""mobile-editor-style"": ""Mobiele editor uiterlijk"", - ""default-memo-sort-option"": ""Sorteer op tijd van aanmaken/wijziging"", - ""telegram-user-id"": ""Telegram User ID"", - ""telegram-user-id-placeholder"": ""Stuur je memos naar je Telegram bot"", - ""created_ts"": ""Tijd van aanmaken"", - ""updated_ts"": ""Tijd van wijziging"", - ""daily-review-time-offset"": ""Dagelijkse review tijdscompensatie"", - ""enable-double-click"": ""Dubbelklik op memo om te bewerken"", - ""auto-collapse"": ""Automatisch samenvouwen"" + ""daily-review"": { + ""title"": ""Dagelijks"", + ""no-memos"": ""Oeps, er is niks."" }, - ""member-section"": { - ""create-a-member"": ""Lid toevoegen"" + ""setting"": { + ""my-account"": ""Mijn account"", + ""preference"": ""Voorkeuren"", + ""member"": ""Gebruikers"", + ""member-list"": ""Gebruikers"", + ""system"": ""Systeem"", + ""account-section"": { + ""title"": ""Accountinformatie"", + ""update-information"": ""Informatie wijzigen"", + ""change-password"": ""Wachtwoord wijzigen"" + }, + ""preference-section"": { + ""theme"": ""Thema"", + ""default-memo-visibility"": ""Standaard memo zichtbaarheid"", + ""enable-folding-memo"": ""Vouwende memo aanzetten"", + ""editor-font-style"": ""Editor lettertype"", + ""mobile-editor-style"": ""Mobiele editor uiterlijk"", + ""default-memo-sort-option"": ""Sorteer op tijd van aanmaken/wijziging"", + ""telegram-user-id"": ""Telegram User ID"", + ""telegram-user-id-placeholder"": ""Stuur je memos naar je Telegram bot"", + ""created_ts"": ""Tijd van aanmaken"", + ""updated_ts"": ""Tijd van wijziging"", + ""daily-review-time-offset"": ""Dagelijkse review tijdscompensatie"", + ""enable-double-click"": ""Dubbelklik op memo om te bewerken"", + ""auto-collapse"": ""Automatisch samenvouwen"" + }, + ""member-section"": { + ""create-a-member"": ""Lid toevoegen"" + }, + ""system-section"": { + ""server-name"": ""Servernaam"", + ""customize-server"": { + ""title"": ""Server aanpassen"", + ""default"": ""Standaard is 'memos'"", + ""icon-url"": ""Icoon URL"" + }, + ""database-file-size"": ""Database bestandsgrootte"", + ""allow-user-signup"": ""Registratie toestaan"", + ""disable-password-login"": ""Wachtwoordlogin uitzetten"", + ""disable-password-login-warning"": ""Als je dit uitzet, kan je niet meer inloggen met een wachtwoord, zonder de database aan te passen. Als je inlogprovider niet werkt, kan je memos niet in."", + ""disable-password-login-final-warning"": ""Typ \""CONFIRM\"" als je zeker weet wat je doet."", + ""enable-password-login"": ""Wachtwoordlogin aanzetten"", + ""enable-password-login-warning"": ""Als je dit aanzet kan er met zowel SSO als een wachtwoord ingelogd worden."", + ""additional-style"": ""Optionele stijl"", + ""additional-script"": ""Optionele scripts"", + ""additional-style-placeholder"": ""Optionele CSS code"", + ""additional-script-placeholder"": ""Optionele JavaScript code"", + ""disable-public-memos"": ""Openbare memos uitzetten"", + ""max-upload-size"": ""Maximum uploadgrootte (MiB)"", + ""max-upload-size-hint"": ""32 MiB wordt aangeraden."", + ""auto-backup-interval"": ""Automatische backupinterval (seconden)"", + ""auto-backup-interval-hint"": ""Kies 0 om de automatische backup uit te zetten. Herstart van memos is nodig na deze aanpassing."", + ""display-with-updated-time"": ""Laten zien met bewerkte tijd"", + ""telegram-bot-token"": ""Telegram bot token"", + ""telegram-bot-token-description"": ""Telegram bot token of API proxy zoals `http://.../bot`"", + ""telegram-bot-token-placeholder"": ""Je Telegram bot token"" + }, + ""appearance-option"": { + ""light"": ""Altijd licht"", + ""dark"": ""Altijd donker"", + ""system"": ""Volg systeem"" + }, + ""storage"": ""Opslag"", + ""sso"": ""SSO"", + ""sso-section"": { + ""sso-list"": ""SSO lijst"", + ""delete-sso"": ""Verwijdering bevestigen"", + ""confirm-delete"": ""Weet je zeker dat je de \""{{name}}\"" SSO configuratie wilt verwijderen?\n\nDeze actie is niet terug te draaien!"", + ""create-sso"": ""SSO instellen"", + ""update-sso"": ""SSO bijwerken"", + ""sso-created"": ""SSO {{name}} ingesteld"", + ""sso-updated"": ""SSO {{name}} bijgewerkt"", + ""identifier"": ""Identifier"", + ""display-name"": ""Weergavenaam"", + ""template"": ""Sjabloon"", + ""custom"": ""Aangepast"", + ""identifier-filter"": ""Identifier Filter"", + ""redirect-url"": ""Redirect URL"", + ""client-id"": ""Client ID"", + ""client-secret"": ""Client secret"", + ""authorization-endpoint"": ""Authorization endpoint"", + ""token-endpoint"": ""Token endpoint"", + ""user-endpoint"": ""User endpoint"", + ""scopes"": ""Scopes"", + ""disabled-password-login-warning"": ""Wachtwoordlogin is uitgeschakeld. Kijk uit met het verwijderen van inlogproviders!"" + }, + ""storage-section"": { + ""current-storage"": ""Huidige objectopslag"", + ""type-database"": ""Database"", + ""type-local"": ""Lokaal"", + ""storage-services-list"": ""Opslagdiensten"", + ""create-a-service"": ""Opslagdienst instellen"", + ""update-a-service"": ""Opslagdienst bijwerken"", + ""warning-text"": ""Weet je zeker dat je \""{{name}}\"" wilt verwijderen?\n\nDeze actie is niet terug te draaien!"", + ""delete-storage"": ""Opslagdienst verwijderen"", + ""local-storage-path"": ""Lokaal opslagpad"", + ""update-local-path"": ""Lokaal opslagpad bijwerken"", + ""update-local-path-description"": ""Lokaal opslagpad is relatief aan je databasebestand."", + ""create-storage"": ""Opslagdienst instellen"", + ""update-storage"": ""Opslagdienst bijwerken"", + ""endpoint"": ""Endpoint"", + ""s3-compatible-url"": ""S3 compatibele URL"", + ""region"": ""Regio"", + ""region-placeholder"": ""Regionaam"", + ""accesskey"": ""Access key"", + ""accesskey-placeholder"": ""Access key / Access ID"", + ""secretkey"": ""Secret key"", + ""secretkey-placeholder"": ""Secret key / Access Key"", + ""bucket"": ""Bucket"", + ""bucket-placeholder"": ""Bucket name"", + ""path"": ""Opslagpad"", + ""path-description"": ""Je kan dezelfde dynamische variabelen gebruiken, zoals {filename}"", + ""path-placeholder"": ""eigen/pad"", + ""url-prefix"": ""URL prefix"", + ""url-prefix-placeholder"": ""Aagnepaste URL prefix, optioneel"", + ""url-suffix"": ""URL suffix"", + ""url-suffix-placeholder"": ""Aangepaste URL suffix, optioneel"" + } }, - ""system-section"": { - ""server-name"": ""Servernaam"", - ""customize-server"": { - ""title"": ""Server aanpassen"", - ""default"": ""Standaard is 'memos'"", - ""icon-url"": ""Icoon URL"" - }, - ""database-file-size"": ""Database bestandsgrootte"", - ""allow-user-signup"": ""Registratie toestaan"", - ""disable-password-login"": ""Wachtwoordlogin uitzetten"", - ""disable-password-login-warning"": ""Als je dit uitzet, kan je niet meer inloggen met een wachtwoord, zonder de database aan te passen. Als je inlogprovider niet werkt, kan je memos niet in."", - ""disable-password-login-final-warning"": ""Typ \""CONFIRM\"" als je zeker weet wat je doet."", - ""enable-password-login"": ""Wachtwoordlogin aanzetten"", - ""enable-password-login-warning"": ""Als je dit aanzet kan er met zowel SSO als een wachtwoord ingelogd worden."", - ""additional-style"": ""Optionele stijl"", - ""additional-script"": ""Optionele scripts"", - ""additional-style-placeholder"": ""Optionele CSS code"", - ""additional-script-placeholder"": ""Optionele JavaScript code"", - ""disable-public-memos"": ""Openbare memos uitzetten"", - ""max-upload-size"": ""Maximum uploadgrootte (MiB)"", - ""max-upload-size-hint"": ""32 MiB wordt aangeraden."", - ""auto-backup-interval"": ""Automatische backupinterval (seconden)"", - ""auto-backup-interval-hint"": ""Kies 0 om de automatische backup uit te zetten. Herstart van memos is nodig na deze aanpassing."", - ""display-with-updated-time"": ""Laten zien met bewerkte tijd"", - ""telegram-bot-token"": ""Telegram bot token"", - ""telegram-bot-token-description"": ""Telegram bot token of API proxy zoals `http://.../bot`"", - ""telegram-bot-token-placeholder"": ""Je Telegram bot token"" + ""amount-text"": { + ""memo_one"": ""MEMO"", + ""memo_other"": ""MEMOS"" }, - ""appearance-option"": { - ""light"": ""Altijd licht"", - ""dark"": ""Altijd donker"", - ""system"": ""Volg systeem"" + ""message"": { + ""no-data"": ""Geen data gevonden."", + ""memos-ready"": ""alle memos zijn geladen 🎉"", + ""restored-successfully"": ""Succesvol teruggezet"", + ""memo-updated-datetime"": ""Tijd van aanmaken gewijzigd."", + ""invalid-created-datetime"": ""Onjuiste tijd van aanmaken."", + ""change-memo-created-time"": ""Tijd van aanmaken wijzigen"", + ""memo-not-found"": ""Memo niet gevonden."", + ""fill-all"": ""Vul alsjeblieft alle velden in."", + ""new-password-not-match"": ""Nieuwe wachtwoorden komen niet overeen."", + ""image-load-failed"": ""Afbeelding laden mislukt"", + ""fill-form"": ""Vul alsjeblieft het formulier in."", + ""login-failed"": ""Inloggen mislukt"", + ""signup-failed"": ""Registreren mislukt"", + ""user-not-found"": ""Gebruiker niet gevonden"", + ""password-changed"": ""Wachtwoord gewijzigd."", + ""private-only"": ""Deze memo is privé."", + ""copied"": ""Gekopieerd"", + ""succeed-copy-content"": ""Inhoud gekopieerd naar klembord."", + ""change-resource-filename"": ""Bestandsnaam van bron wijzigen"", + ""resource-filename-updated"": ""Bestandsnaam van bron gewijzigd."", + ""invalid-resource-filename"": ""Onjuiste bestandsnaam."", + ""click-to-save-the-image"": ""Klik om de afbeelding op te slaan"", + ""generating-the-screenshot"": ""Screenshot genereren..."", + ""succeed-vacuum-database"": ""Succeed to vacuum database"", + ""succeed-update-additional-style"": ""Optionele stijl bijgewerkt"", + ""succeed-copy-resource-link"": ""Link naar bron gekopieërd naar klembord."", + ""succeed-update-customized-profile"": ""Profiel bijgewerkt."", + ""succeed-update-additional-script"": ""Optioneel script bijgewerkt."", + ""update-succeed"": ""Update voltooid"", + ""succeed-copy-code"": ""Code gekopieërd naar klembord."", + ""page-not-found"": ""404 - Pagina niet gevonden 😥"", + ""password-not-match"": ""Wachtwoorden komen niet overeen."", + ""succeed-copy-link"": ""Link gekopieërd naar klembord."", + ""count-selected-resources"": ""Totaal geselecteerd"", + ""file-exceeds-upload-limit-of"": ""Bestand {{file}} is groter dan het limiet van {{size}} MiB"", + ""updating-setting-failed"": ""Instelling aanpassen mislukt"", + ""password-login-disabled"": ""Je kan niet de laatste inlogprovider verwijderen als inloggen met wachtwoord is uitgeschakeld."" }, - ""storage"": ""Opslag"", - ""sso"": ""SSO"", - ""sso-section"": { - ""sso-list"": ""SSO lijst"", - ""delete-sso"": ""Verwijdering bevestigen"", - ""confirm-delete"": ""Weet je zeker dat je de \""{{name}}\"" SSO configuratie wilt verwijderen?\n\nDeze actie is niet terug te draaien!"", - ""create-sso"": ""SSO instellen"", - ""update-sso"": ""SSO bijwerken"", - ""sso-created"": ""SSO {{name}} ingesteld"", - ""sso-updated"": ""SSO {{name}} bijgewerkt"", - ""identifier"": ""Identifier"", - ""display-name"": ""Weergavenaam"", - ""template"": ""Sjabloon"", - ""custom"": ""Aangepast"", - ""identifier-filter"": ""Identifier Filter"", - ""redirect-url"": ""Redirect URL"", - ""client-id"": ""Client ID"", - ""client-secret"": ""Client secret"", - ""authorization-endpoint"": ""Authorization endpoint"", - ""token-endpoint"": ""Token endpoint"", - ""user-endpoint"": ""User endpoint"", - ""scopes"": ""Scopes"", - ""disabled-password-login-warning"": ""Wachtwoordlogin is uitgeschakeld. Kijk uit met het verwijderen van inlogproviders!"" + ""days"": { + ""mon"": ""ma"", + ""tue"": ""di"", + ""wed"": ""wo"", + ""thu"": ""do"", + ""fri"": ""vr"", + ""sat"": ""za"", + ""sun"": ""zo"" }, - ""storage-section"": { - ""current-storage"": ""Huidige objectopslag"", - ""type-database"": ""Database"", - ""type-local"": ""Lokaal"", - ""storage-services-list"": ""Opslagdiensten"", - ""create-a-service"": ""Opslagdienst instellen"", - ""update-a-service"": ""Opslagdienst bijwerken"", - ""warning-text"": ""Weet je zeker dat je \""{{name}}\"" wilt verwijderen?\n\nDeze actie is niet terug te draaien!"", - ""delete-storage"": ""Opslagdienst verwijderen"", - ""local-storage-path"": ""Lokaal opslagpad"", - ""update-local-path"": ""Lokaal opslagpad bijwerken"", - ""update-local-path-description"": ""Lokaal opslagpad is relatief aan je databasebestand."", - ""create-storage"": ""Opslagdienst instellen"", - ""update-storage"": ""Opslagdienst bijwerken"", - ""endpoint"": ""Endpoint"", - ""s3-compatible-url"": ""S3 compatibele URL"", - ""region"": ""Regio"", - ""region-placeholder"": ""Regionaam"", - ""accesskey"": ""Access key"", - ""accesskey-placeholder"": ""Access key / Access ID"", - ""secretkey"": ""Secret key"", - ""secretkey-placeholder"": ""Secret key / Access Key"", - ""bucket"": ""Bucket"", - ""bucket-placeholder"": ""Bucket name"", - ""path"": ""Opslagpad"", - ""path-description"": ""Je kan dezelfde dynamische variabelen gebruiken, zoals {filename}"", - ""path-placeholder"": ""eigen/pad"", - ""url-prefix"": ""URL prefix"", - ""url-prefix-placeholder"": ""Aagnepaste URL prefix, optioneel"", - ""url-suffix"": ""URL suffix"", - ""url-suffix-placeholder"": ""Aangepaste URL suffix, optioneel"" + ""embed-memo"": { + ""title"": ""Memo insluiten"", + ""text"": ""Kopieer en plak onderstaande code op je eigen website"", + ""only-public-supported"": ""* alleen openbare memos kunnen ingesloten worden"", + ""copy"": ""Kopieer"" + }, + ""heatmap"": { + ""memo-in"": ""memo in {{period}}"", + ""memos-in"": ""memos in {{period}}"", + ""memo-on"": ""{{amount}} memo op {{date}}"", + ""memos-on"": ""{{amount}} memos op {{date}}"", + ""day"": ""dag"", + ""days"": ""dagen"" + }, + ""about"": { + ""about-memos"": ""Over Memos"", + ""memos-description"": ""Memos is een web-based noteerapplicatie die je kan gebruiekn om notities te schrijven, organiseren en delen."", + ""no-server-description"": ""Geen beschrijving geconfigureerd."", + ""powered-by"": ""Mogelijk gemaakt door"", + ""other-projects"": ""Andere projecten"" + }, + ""router"": { + ""go-to-home"": ""Ga naar homepagina"", + ""back-to-top"": ""Terug naar boven"" } - }, - ""amount-text"": { - ""memo_one"": ""MEMO"", - ""memo_other"": ""MEMOS"", - ""tag_one"": ""LABEL"", - ""tag_other"": ""LABELS"", - ""day_one"": ""DAG"", - ""day_other"": ""DAGEN"" - }, - ""message"": { - ""no-data"": ""Geen data gevonden."", - ""no-memos"": ""geen memos 🌃"", - ""memos-ready"": ""alle memos zijn geladen 🎉"", - ""restored-successfully"": ""Succesvol teruggezet"", - ""memo-updated-datetime"": ""Tijd van aanmaken gewijzigd."", - ""invalid-created-datetime"": ""Onjuiste tijd van aanmaken."", - ""change-memo-created-time"": ""Tijd van aanmaken wijzigen"", - ""memo-not-found"": ""Memo niet gevonden."", - ""fill-all"": ""Vul alsjeblieft alle velden in."", - ""new-password-not-match"": ""Nieuwe wachtwoorden komen niet overeen."", - ""image-load-failed"": ""Afbeelding laden mislukt"", - ""fill-form"": ""Vul alsjeblieft het formulier in."", - ""login-failed"": ""Inloggen mislukt"", - ""signup-failed"": ""Registreren mislukt"", - ""user-not-found"": ""Gebruiker niet gevonden"", - ""password-changed"": ""Wachtwoord gewijzigd."", - ""private-only"": ""Deze memo is privé."", - ""copied"": ""Gekopieerd"", - ""succeed-copy-content"": ""Inhoud gekopieerd naar klembord."", - ""change-resource-filename"": ""Bestandsnaam van bron wijzigen"", - ""resource-filename-updated"": ""Bestandsnaam van bron gewijzigd."", - ""invalid-resource-filename"": ""Onjuiste bestandsnaam."", - ""click-to-save-the-image"": ""Klik om de afbeelding op te slaan"", - ""generating-the-screenshot"": ""Screenshot genereren..."", - ""succeed-vacuum-database"": ""Succeed to vacuum database"", - ""succeed-update-additional-style"": ""Optionele stijl bijgewerkt"", - ""succeed-copy-resource-link"": ""Link naar bron gekopieërd naar klembord."", - ""succeed-update-customized-profile"": ""Profiel bijgewerkt."", - ""succeed-update-additional-script"": ""Optioneel script bijgewerkt."", - ""update-succeed"": ""Update voltooid"", - ""succeed-copy-code"": ""Code gekopieërd naar klembord."", - ""too-short"": ""Te kort"", - ""too-long"": ""Te lang"", - ""not-allow-space"": ""Spaties zijn niet toegestaan"", - ""not-allow-chinese"": ""Chinees is niet toegestaan"", - ""page-not-found"": ""404 - Pagina niet gevonden 😥"", - ""password-not-match"": ""Wachtwoorden komen niet overeen."", - ""succeed-copy-link"": ""Link gekopieërd naar klembord."", - ""count-selected-resources"": ""Totaal geselecteerd"", - ""file-exceeds-upload-limit-of"": ""Bestand {{file}} is groter dan het limiet van {{size}} MiB"", - ""updating-setting-failed"": ""Instelling aanpassen mislukt"", - ""password-login-disabled"": ""Je kan niet de laatste inlogprovider verwijderen als inloggen met wachtwoord is uitgeschakeld."" - }, - ""days"": { - ""monday"": ""Maandag"", - ""mon"": ""ma"", - ""tuesday"": ""Dinsdag"", - ""tue"": ""di"", - ""wednesday"": ""Woensdag"", - ""wed"": ""wo"", - ""thursday"": ""Donderdag"", - ""thu"": ""do"", - ""friday"": ""Vrijdag"", - ""fri"": ""vr"", - ""saturday"": ""Zaterdag"", - ""sat"": ""za"", - ""sunday"": ""Zondag"", - ""sun"": ""zo"" - }, - ""embed-memo"": { - ""title"": ""Memo insluiten"", - ""text"": ""Kopieer en plak onderstaande code op je eigen website"", - ""only-public-supported"": ""* alleen openbare memos kunnen ingesloten worden"", - ""copy"": ""Kopieer"" - }, - ""heatmap"": { - ""memo-in"": ""memo in {{period}}"", - ""memos-in"": ""memos in {{period}}"", - ""memo-on"": ""{{amount}} memo op {{date}}"", - ""memos-on"": ""{{amount}} memos op {{date}}"", - ""day"": ""dag"", - ""days"": ""dagen"" - }, - ""about"": { - ""about-memos"": ""Over Memos"", - ""memos-description"": ""Memos is een web-based noteerapplicatie die je kan gebruiekn om notities te schrijven, organiseren en delen."", - ""no-server-description"": ""Geen beschrijving geconfigureerd."", - ""powered-by"": ""Mogelijk gemaakt door"", - ""other-projects"": ""Andere projecten"" - } } diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json index ccd00db61d3e8..df61ffc09864c 100644 --- a/web/src/locales/pl.json +++ b/web/src/locales/pl.json @@ -1,261 +1,190 @@ { - ""common"": { - ""about"": ""O aplikacji"", - ""email"": ""E-mail"", - ""password"": ""Hasło"", - ""repeat-password-short"": ""Powtórz"", - ""repeat-password"": ""Powtórz hasło"", - ""new-password"": ""Nowe hasło"", - ""repeat-new-password"": ""Powtórz nowe hasło"", - ""avatar"": ""Awatar"", - ""username"": ""Nazwa użytkownika"", - ""nickname"": ""Pseudonim"", - ""save"": ""Zapisz"", - ""close"": ""Zamknij"", - ""cancel"": ""Anuluj"", - ""create"": ""Utwórz"", - ""change"": ""Zmień"", - ""confirm"": ""Potwierdź"", - ""reset"": ""Resetuj"", - ""language"": ""Język"", - ""version"": ""Wersja"", - ""pin"": ""Przypnij"", - ""unpin"": ""Odepnij"", - ""edit"": ""Edytuj"", - ""restore"": ""Przywróć"", - ""delete"": ""Usuń"", - ""null"": ""Null"", - ""share"": ""Udostępnij"", - ""archive"": ""Archiwizuj"", - ""basic"": ""Podstawowe"", - ""admin"": ""Admin"", - ""explore"": ""Odkrywaj"", - ""sign-in"": ""Zaloguj"", - ""sign-up"": ""Utwórz konto"", - ""sign-out"": ""Wyloguj"", - ""back-to-home"": ""Powrót do Strony Głównej"", - ""type"": ""Typ"", - ""title"": ""Tytuł"", - ""filter"": ""Filtruj"", - ""tags"": ""Tagi"", - ""yourself"": ""Ty"", - ""archived-at"": ""Zarchiwizowano"", - ""changed"": ""zmodyfikowano"", - ""update-on"": ""Aktualizacja dnia"", - ""fold"": ""Zwiń"", - ""expand"": ""Rozwiń"", - ""image"": ""Obrazek"", - ""link"": ""Link"", - ""vacuum"": ""Vacuum"", - ""select"": ""Wybierz"", - ""database"": ""Baza danych"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Zarejestruj się jako właściciel"", - ""host-tip"": ""Rejestrujesz się jako właściciel."", - ""not-host-tip"": ""Jeśli nie posiadasz konta skontaktuj się z właścicielem strony."" - }, - ""sidebar"": { - ""daily-review"": ""Podsumowanie dnia"", - ""resources"": ""Zasoby"", - ""setting"": ""Ustawienia"", - ""archived"": ""Zarchiwizowane"" - }, - ""resource"": { - ""description"": ""Zobacz statyczne zasoby w notatkach, na przykład obrazki"", - ""no-resources"": ""Brak zasobów."", - ""fetching-data"": ""pobieranie danych..."", - ""upload"": ""Wrzuć"", - ""preview"": ""Podgląd"", - ""linked-amount"": ""Liczba kwalifikujących się notatek"", - ""copy-link"": ""Kopiuj odnośnik"", - ""delete-resource"": ""Usuń zasób"", - ""warning-text"": ""Czy na pewno chcesz usunąć zasób? To działanie jest nieodwracalne❗"", - ""rename"": ""Zmień nazwę"", - ""clear"": ""Wyczyść"", - ""warning-text-unused"": ""Czy na pewno chcesz usunąć nieużywany zasób? To działanie jest nieodwracalne❗"", - ""no-unused-resources"": ""Brak nieużywanych zasobów"", - ""name"": ""Nazwa"" - }, - ""archived"": { - ""archived-memos"": ""Zarchiwizowane notatki"", - ""no-archived-memos"": ""Brak zarchiwizowanych notatek."", - ""fetching-data"": ""pobieranie danych..."" - }, - ""editor"": { - ""editing"": ""Edytowanie..."", - ""cancel-edit"": ""Anuluj edycję"", - ""save"": ""Zapisz"", - ""placeholder"": ""Jakieś przemyślenia..."", - ""only-image-supported"": ""Obsługiwane są tylko obrazy."", - ""cant-empty"": ""Treść nie może być pusta"", - ""local"": ""Lokalne"", - ""resources"": ""Zasoby"" - }, - ""memo"": { - ""view-detail"": ""Zobacz szczegóły"", - ""copy"": ""Kopiuj"", - ""copy-link"": ""Kopiuj odnośnik"", - ""visibility"": { - ""private"": ""Widoczne tylko dla ciebie"", - ""protected"": ""Widoczne dla użytkowników"", - ""public"": ""Widoczne dla wszystkich"", - ""disabled"": ""Publiczne notatki są wyłączone"" - } - }, - ""memo-list"": { - ""fetching-data"": ""pobieranie danych..."", - ""fetch-more"": ""Kliknij, aby pobrać więcej"" - }, - ""filter"": { - ""new-filter"": ""Nowy filtr"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Typ"", - ""text"": ""Tekst"", - ""display-time"": ""Wyświetlana data"", - ""visibility"": ""Widoczność"" + ""common"": { + ""about"": ""O aplikacji"", + ""email"": ""E-mail"", + ""password"": ""Hasło"", + ""avatar"": ""Awatar"", + ""username"": ""Nazwa użytkownika"", + ""nickname"": ""Pseudonim"", + ""save"": ""Zapisz"", + ""close"": ""Zamknij"", + ""cancel"": ""Anuluj"", + ""create"": ""Utwórz"", + ""change"": ""Zmień"", + ""confirm"": ""Potwierdź"", + ""reset"": ""Resetuj"", + ""language"": ""Język"", + ""version"": ""Wersja"", + ""pin"": ""Przypnij"", + ""unpin"": ""Odepnij"", + ""edit"": ""Edytuj"", + ""restore"": ""Przywróć"", + ""delete"": ""Usuń"", + ""null"": ""Null"", + ""share"": ""Udostępnij"", + ""archive"": ""Archiwizuj"", + ""basic"": ""Podstawowe"", + ""admin"": ""Admin"", + ""explore"": ""Odkrywaj"", + ""sign-in"": ""Zaloguj"", + ""sign-up"": ""Utwórz konto"", + ""sign-out"": ""Wyloguj"", + ""type"": ""Typ"", + ""title"": ""Tytuł"", + ""filter"": ""Filtruj"", + ""tags"": ""Tagi"", + ""yourself"": ""Ty"", + ""changed"": ""zmodyfikowano"", + ""fold"": ""Zwiń"", + ""expand"": ""Rozwiń"", + ""image"": ""Obrazek"", + ""link"": ""Link"", + ""vacuum"": ""Vacuum"", + ""select"": ""Wybierz"", + ""database"": ""Baza danych"", + ""mark"": ""Mark"" + }, + ""auth"": { + ""host-tip"": ""Rejestrujesz się jako właściciel."" }, - ""operator"": { - ""contains"": ""Zawiera"", - ""not-contains"": ""Nie zawiera"", - ""is"": ""To"", - ""is-not"": ""Różny od"", - ""before"": ""Przed"", - ""after"": ""Po"" + ""resource"": { + ""no-resources"": ""Brak zasobów."", + ""fetching-data"": ""pobieranie danych..."", + ""linked-amount"": ""Liczba kwalifikujących się notatek"", + ""copy-link"": ""Kopiuj odnośnik"", + ""delete-resource"": ""Usuń zasób"", + ""warning-text"": ""Czy na pewno chcesz usunąć zasób? To działanie jest nieodwracalne❗"", + ""clear"": ""Wyczyść"", + ""warning-text-unused"": ""Czy na pewno chcesz usunąć nieużywany zasób? To działanie jest nieodwracalne❗"", + ""no-unused-resources"": ""Brak nieużywanych zasobów"" }, - ""value"": { - ""not-tagged"": ""Brak tagów"", - ""linked"": ""Posiada linki"" + ""editor"": { + ""editing"": ""Edytowanie..."", + ""cancel-edit"": ""Anuluj edycję"", + ""save"": ""Zapisz"", + ""placeholder"": ""Jakieś przemyślenia..."", + ""only-image-supported"": ""Obsługiwane są tylko obrazy."", + ""cant-empty"": ""Treść nie może być pusta"", + ""local"": ""Lokalne"", + ""resources"": ""Zasoby"" }, - ""text-placeholder"": ""Rozpocznij z ^, aby wykorzystać regex"" - }, - ""tag-list"": { - ""tip-text"": ""Wprowadź `#tag` aby utworzyć"" - }, - ""search"": { - ""quickly-filter"": ""Szybkie filtry"" - }, - ""setting"": { - ""my-account"": ""Moje konto"", - ""preference"": ""Ustawienia"", - ""member"": ""Użytkownik"", - ""member-list"": ""Lista użytkowników"", - ""system"": ""System"", - ""storage"": ""Przechowywanie"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""Informacje o koncie"", - ""update-information"": ""Aktualizuj informacje"", - ""change-password"": ""Zmień hasło"" + ""memo"": { + ""view-detail"": ""Zobacz szczegóły"", + ""copy-link"": ""Kopiuj odnośnik"", + ""visibility"": { + ""private"": ""Widoczne tylko dla ciebie"", + ""protected"": ""Widoczne dla użytkowników"", + ""public"": ""Widoczne dla wszystkich"", + ""disabled"": ""Publiczne notatki są wyłączone"" + } }, - ""preference-section"": { - ""theme"": ""Motyw"", - ""default-memo-visibility"": ""Domyślna widoczność notatki"", - ""enable-folding-memo"": ""Włącz zawijanie notatek"", - ""enable-double-click"": ""Włącz podwójne kliknięcie aby edytować"", - ""editor-font-style"": ""Styl czcionki w edytorze"", - ""mobile-editor-style"": ""Styl edytora mobilnego"", - ""default-memo-sort-option"": ""Wyświetlana data notatki"", - ""created_ts"": ""Data utworzenia"", - ""updated_ts"": ""Data aktualizacji"", - ""auto-collapse"": ""Automatyczne zwijanie"" + ""tag-list"": { + ""tip-text"": ""Wprowadź `#tag` aby utworzyć"" }, - ""storage-section"": { - ""storage-services-list"": ""Lista usług przechowywania"", - ""create-a-service"": ""Utwórz serwis"", - ""update-a-service"": ""Aktualizuj serwis"", - ""warning-text"": ""Czy na pewno chcesz usunąć ten serwis przechowywania? Ta akcja jest nieodwracalna❗"", - ""delete-storage"": ""Usuń serwis przechowywania"" + ""setting"": { + ""my-account"": ""Moje konto"", + ""preference"": ""Ustawienia"", + ""member"": ""Użytkownik"", + ""member-list"": ""Lista użytkowników"", + ""system"": ""System"", + ""storage"": ""Przechowywanie"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""Informacje o koncie"", + ""update-information"": ""Aktualizuj informacje"", + ""change-password"": ""Zmień hasło"" + }, + ""preference-section"": { + ""theme"": ""Motyw"", + ""default-memo-visibility"": ""Domyślna widoczność notatki"", + ""enable-folding-memo"": ""Włącz zawijanie notatek"", + ""enable-double-click"": ""Włącz podwójne kliknięcie aby edytować"", + ""editor-font-style"": ""Styl czcionki w edytorze"", + ""mobile-editor-style"": ""Styl edytora mobilnego"", + ""default-memo-sort-option"": ""Wyświetlana data notatki"", + ""created_ts"": ""Data utworzenia"", + ""updated_ts"": ""Data aktualizacji"", + ""auto-collapse"": ""Automatyczne zwijanie"" + }, + ""storage-section"": { + ""storage-services-list"": ""Lista usług przechowywania"", + ""create-a-service"": ""Utwórz serwis"", + ""update-a-service"": ""Aktualizuj serwis"", + ""warning-text"": ""Czy na pewno chcesz usunąć ten serwis przechowywania? Ta akcja jest nieodwracalna❗"", + ""delete-storage"": ""Usuń serwis przechowywania"" + }, + ""member-section"": { + ""create-a-member"": ""Utwórz użytkownika"" + }, + ""system-section"": { + ""server-name"": ""Nazwa serwera"", + ""customize-server"": { + ""title"": ""Personalizuj serwer"", + ""default"": ""Domyślnie to memos"", + ""icon-url"": ""URL ikony"" + }, + ""database-file-size"": ""Rozmiar bazy danych"", + ""allow-user-signup"": ""Zezwól na rejestrację"", + ""disable-public-memos"": ""Wyłącz publiczne notatki"", + ""additional-style"": ""Dodatkowy styl"", + ""additional-script"": ""Dodatkowy skrypt"", + ""additional-style-placeholder"": ""Dodatkowy kod CSS"", + ""additional-script-placeholder"": ""Dodatkowy kod JavaScript"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Systemowy"", + ""light"": ""Zawsze jasny"", + ""dark"": ""Zawsze ciemny"" + } }, - ""member-section"": { - ""create-a-member"": ""Utwórz użytkownika"" + ""amount-text"": { + ""memo_one"": ""NOTATKA"", + ""memo_few"": """", + ""memo_many"": """" }, - ""system-section"": { - ""server-name"": ""Nazwa serwera"", - ""customize-server"": { - ""title"": ""Personalizuj serwer"", - ""default"": ""Domyślnie to memos"", - ""icon-url"": ""URL ikony"" - }, - ""database-file-size"": ""Rozmiar bazy danych"", - ""allow-user-signup"": ""Zezwól na rejestrację"", - ""disable-public-memos"": ""Wyłącz publiczne notatki"", - ""additional-style"": ""Dodatkowy styl"", - ""additional-script"": ""Dodatkowy skrypt"", - ""additional-style-placeholder"": ""Dodatkowy kod CSS"", - ""additional-script-placeholder"": ""Dodatkowy kod JavaScript"", - ""display-with-updated-time"": ""Display with updated time"" + ""message"": { + ""memos-ready"": ""wszystkie notatki są gotowe 🎉"", + ""restored-successfully"": ""Pomyślnie przywrócono"", + ""memo-updated-datetime"": ""Zmieniono datę utworzenia notatki."", + ""invalid-created-datetime"": ""Niepoprawna data utworzenia."", + ""change-memo-created-time"": ""Zmień datę utworzenia notatki"", + ""memo-not-found"": ""Nie znaleziono notatki."", + ""fill-all"": ""Proszę uzupełnij wszystkie pola."", + ""password-not-match"": ""Hasła się nie zgadzają."", + ""new-password-not-match"": ""Nowe hasła się nie zgadzają."", + ""image-load-failed"": ""Nie udało się wczytać obrazka"", + ""fill-form"": ""Proszę uzupełnij formularz"", + ""login-failed"": ""Błąd logowania"", + ""signup-failed"": ""Błąd rejestracji"", + ""user-not-found"": ""Nie znaleziono użytkownika"", + ""password-changed"": ""Zmieniono hasło"", + ""private-only"": ""Ta notatka jest prywatna."", + ""copied"": ""Skopiowano"", + ""succeed-copy-content"": ""Skopiowano treść do schowka."", + ""succeed-copy-code"": ""Skopiowano kod do schowka."", + ""succeed-copy-link"": ""Skopiowano link do schowka."", + ""change-resource-filename"": ""Zmień nazwę pliku zasobu"", + ""resource-filename-updated"": ""Zmieniono nazwę pliku zasobu."", + ""invalid-resource-filename"": ""Niepoprawna nazwa pliku."", + ""click-to-save-the-image"": ""Kliknij aby zapisać obrazek"", + ""generating-the-screenshot"": ""Generowanie zrzutu ekranu..."", + ""count-selected-resources"": ""Wybrano łącznie"", + ""succeed-vacuum-database"": ""Udało się wyczyścić bazę danych"", + ""succeed-update-additional-style"": ""Udało się zaktualizować dodatkowy styl"", + ""succeed-copy-resource-link"": ""Udało się skopiować link do zasobu do schowka"", + ""succeed-update-customized-profile"": ""Udało się zaktualizować spersonalizowany profil"", + ""succeed-update-additional-script"": ""Udało się zaktualizować dodatkowy skrypt"", + ""update-succeed"": ""Aktualizacja się powiodła"", + ""page-not-found"": ""404 - Nie znaleziono 😥"" }, - ""appearance-option"": { - ""system"": ""Systemowy"", - ""light"": ""Zawsze jasny"", - ""dark"": ""Zawsze ciemny"" + ""days"": { + ""mon"": ""Pon"", + ""tue"": ""Wt"", + ""wed"": ""Śr"", + ""thu"": ""Czw"", + ""fri"": ""Pt"", + ""sat"": ""Sob"", + ""sun"": ""Nie"" } - }, - ""amount-text"": { - ""memo_one"": ""NOTATKA"", - ""memo_few"": """", - ""tag_one"": ""TAG"", - ""tag_few"": """", - ""day_one"": ""DZIEŃ"", - ""day_few"": """" - }, - ""message"": { - ""no-memos"": ""brak notatek 🌃"", - ""memos-ready"": ""wszystkie notatki są gotowe 🎉"", - ""restored-successfully"": ""Pomyślnie przywrócono"", - ""memo-updated-datetime"": ""Zmieniono datę utworzenia notatki."", - ""invalid-created-datetime"": ""Niepoprawna data utworzenia."", - ""change-memo-created-time"": ""Zmień datę utworzenia notatki"", - ""memo-not-found"": ""Nie znaleziono notatki."", - ""fill-all"": ""Proszę uzupełnij wszystkie pola."", - ""password-not-match"": ""Hasła się nie zgadzają."", - ""new-password-not-match"": ""Nowe hasła się nie zgadzają."", - ""image-load-failed"": ""Nie udało się wczytać obrazka"", - ""fill-form"": ""Proszę uzupełnij formularz"", - ""login-failed"": ""Błąd logowania"", - ""signup-failed"": ""Błąd rejestracji"", - ""user-not-found"": ""Nie znaleziono użytkownika"", - ""password-changed"": ""Zmieniono hasło"", - ""private-only"": ""Ta notatka jest prywatna."", - ""copied"": ""Skopiowano"", - ""succeed-copy-content"": ""Skopiowano treść do schowka."", - ""succeed-copy-code"": ""Skopiowano kod do schowka."", - ""succeed-copy-link"": ""Skopiowano link do schowka."", - ""change-resource-filename"": ""Zmień nazwę pliku zasobu"", - ""resource-filename-updated"": ""Zmieniono nazwę pliku zasobu."", - ""invalid-resource-filename"": ""Niepoprawna nazwa pliku."", - ""click-to-save-the-image"": ""Kliknij aby zapisać obrazek"", - ""generating-the-screenshot"": ""Generowanie zrzutu ekranu..."", - ""count-selected-resources"": ""Wybrano łącznie"", - ""too-short"": ""Za krótkie"", - ""too-long"": ""Za długie"", - ""not-allow-space"": ""Spacja niedozwolona"", - ""not-allow-chinese"": ""Chiński niedozwolony"", - ""succeed-vacuum-database"": ""Udało się wyczyścić bazę danych"", - ""succeed-update-additional-style"": ""Udało się zaktualizować dodatkowy styl"", - ""succeed-copy-resource-link"": ""Udało się skopiować link do zasobu do schowka"", - ""succeed-update-customized-profile"": ""Udało się zaktualizować spersonalizowany profil"", - ""succeed-update-additional-script"": ""Udało się zaktualizować dodatkowy skrypt"", - ""update-succeed"": ""Aktualizacja się powiodła"", - ""page-not-found"": ""404 - Nie znaleziono 😥"" - }, - ""days"": { - ""monday"": ""Poniedziałek"", - ""mon"": ""Pon"", - ""tuesday"": ""Wtorek"", - ""tue"": ""Wt"", - ""wednesday"": ""Środa"", - ""wed"": ""Śr"", - ""thursday"": ""Czwartek"", - ""thu"": ""Czw"", - ""friday"": ""Piątek"", - ""fri"": ""Pt"", - ""saturday"": ""Sobota"", - ""sat"": ""Sob"", - ""sunday"": ""Niedziela"", - ""sun"": ""Nie"" - } } diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json index 51c77092b4748..76f57ad2cb999 100644 --- a/web/src/locales/pt-BR.json +++ b/web/src/locales/pt-BR.json @@ -1,396 +1,339 @@ { - ""common"": { - ""memos-slogan"": ""Uma central de anotações leve e auto-hospedada. De código aberto e gratuito para sempre."", - ""about"": ""Sobre"", - ""home"": ""Início"", - ""resources"": ""Recursos"", - ""settings"": ""Configurações"", - ""archived"": ""Arquivado"", - ""email"": ""Email"", - ""password"": ""Senha"", - ""avatar"": ""Avatar"", - ""username"": ""Nome de usuário"", - ""nickname"": ""Apelido"", - ""save"": ""Salvar"", - ""close"": ""Fechar"", - ""cancel"": ""Cancelar"", - ""create"": ""Criar"", - ""update"": ""Atualizar"", - ""change"": ""Alterar"", - ""confirm"": ""Confirmar"", - ""reset"": ""Redefinir"", - ""language"": ""Idioma"", - ""version"": ""Versão"", - ""pin"": ""Fixar"", - ""unpin"": ""Desafixar"", - ""edit"": ""Editar"", - ""restore"": ""Restaurar"", - ""delete"": ""Deletar"", - ""null"": ""Nulo"", - ""share"": ""Compartilhar"", - ""archive"": ""Arquivar"", - ""basic"": ""Básico"", - ""admin"": ""Admin"", - ""explore"": ""Explorar"", - ""sign-in"": ""Entrar"", - ""sign-in-with"": ""Entrar usando {{provider}}"", - ""or"": ""ou"", - ""sign-up"": ""Registrar"", - ""sign-out"": ""Sair"", - ""type"": ""Tipo"", - ""title"": ""Título"", - ""filter"": ""Filtro"", - ""filter-period"": ""{{from}} até {{to}}"", - ""tags"": ""Tags"", - ""yourself"": ""Você mesmo"", - ""changed"": ""alterado"", - ""fold"": ""Recolher"", - ""expand"": ""Expandir"", - ""image"": ""Imagem"", - ""link"": ""Link"", - ""vacuum"": ""Compactar (vacuum)"", - ""select"": ""Selecionar"", - ""database"": ""Banco de dados"", - ""upload"": ""Carregar"", - ""preview"": ""Pré-visualizar"", - ""rename"": ""Renomear"", - ""clear"": ""Limpar"", - ""name"": ""Nome"", - ""visibility"": ""Visibilidade"", - ""learn-more"": ""Saiba mais"", - ""e.g"": ""ex."", - ""beta"": ""Beta"", - ""profile"": ""Perfil"", - ""dialog"": { - ""error"": ""Erro"", - ""help"": ""Ajuda"", - ""info"": ""Informação"", - ""success"": ""Sucesso"", - ""warning"": ""Aviso"" + ""common"": { + ""about"": ""Sobre"", + ""home"": ""Início"", + ""resources"": ""Recursos"", + ""settings"": ""Configurações"", + ""archived"": ""Arquivado"", + ""email"": ""Email"", + ""password"": ""Senha"", + ""avatar"": ""Avatar"", + ""username"": ""Nome de usuário"", + ""nickname"": ""Apelido"", + ""save"": ""Salvar"", + ""close"": ""Fechar"", + ""cancel"": ""Cancelar"", + ""create"": ""Criar"", + ""update"": ""Atualizar"", + ""change"": ""Alterar"", + ""confirm"": ""Confirmar"", + ""reset"": ""Redefinir"", + ""language"": ""Idioma"", + ""version"": ""Versão"", + ""pin"": ""Fixar"", + ""unpin"": ""Desafixar"", + ""edit"": ""Editar"", + ""restore"": ""Restaurar"", + ""delete"": ""Deletar"", + ""null"": ""Nulo"", + ""share"": ""Compartilhar"", + ""archive"": ""Arquivar"", + ""basic"": ""Básico"", + ""admin"": ""Admin"", + ""explore"": ""Explorar"", + ""sign-in"": ""Entrar"", + ""sign-in-with"": ""Entrar usando {{provider}}"", + ""or"": ""ou"", + ""sign-up"": ""Registrar"", + ""sign-out"": ""Sair"", + ""type"": ""Tipo"", + ""title"": ""Título"", + ""filter"": ""Filtro"", + ""filter-period"": ""{{from}} até {{to}}"", + ""tags"": ""Tags"", + ""yourself"": ""Você mesmo"", + ""changed"": ""alterado"", + ""fold"": ""Recolher"", + ""expand"": ""Expandir"", + ""image"": ""Imagem"", + ""link"": ""Link"", + ""vacuum"": ""Compactar (vacuum)"", + ""select"": ""Selecionar"", + ""database"": ""Banco de dados"", + ""upload"": ""Carregar"", + ""preview"": ""Pré-visualizar"", + ""rename"": ""Renomear"", + ""clear"": ""Limpar"", + ""name"": ""Nome"", + ""visibility"": ""Visibilidade"", + ""learn-more"": ""Saiba mais"", + ""beta"": ""Beta"", + ""profile"": ""Perfil"", + ""mark"": ""Mark"" }, - ""mark"": ""Mark"" - }, - ""router"": { - ""back-to-home"": ""Voltar ao início"" - }, - ""auth"": { - ""signup-as-host"": ""Registrar como Host"", - ""host-tip"": ""Você está se registrando como Host do Site."", - ""not-host-tip"": ""Se você não tem uma conta, por favor, entre em contato com o Host do site."", - ""new-password"": ""Nova senha"", - ""repeat-new-password"": ""Repita a nova senha"" - }, - ""editor"": { - ""editing"": ""Editando..."", - ""cancel-edit"": ""Cancelar edição"", - ""save"": ""Salvar"", - ""placeholder"": ""Alguma ideia..."", - ""only-image-supported"": ""Apenas imagens são suportadas"", - ""cant-empty"": ""O conteúdo não pode estar vazio"", - ""local"": ""Local"", - ""resources"": ""Recursos"" - }, - ""memo"": { - ""view-detail"": ""Ver detalhes"", - ""copy-link"": ""Copiar link"", - ""embed"": ""Incorporar"", - ""archived-memos"": ""Memos arquivados"", - ""no-archived-memos"": ""Nenhum memo arquivado"", - ""fetching-data"": ""obtendo dados..."", - ""fetch-more"": ""Clique para carregar mais dados"", - ""archived-at"": ""Arquivado em"", - ""search-placeholder"": ""Pesquisar memos"", - ""visibility"": { - ""private"": ""Privado (eu)"", - ""protected"": ""Protegido (membros)"", - ""public"": ""Público (todos)"", - ""disabled"": ""Memos públicos estão desabilitados"" + ""auth"": { + ""host-tip"": ""Você está se registrando como Host do Site."", + ""new-password"": ""Nova senha"", + ""repeat-new-password"": ""Repita a nova senha"" }, - ""delete-memo"": ""Deletar memo"", - ""delete-confirm"": ""Tem certeza de que deseja deletar este memo?\n\nESTA AÇÃO É IRREVERSÍVEL❗"" - }, - ""resource"": { - ""no-resources"": ""Nenhum recurso"", - ""fetching-data"": ""obtendo dados..."", - ""copy-link"": ""Copiar link"", - ""reset-link"": ""Redefinir link"", - ""reset-resource-link"": ""Redefinir link do recurso"", - ""reset-link-prompt"": ""Tem certeza de que deseja redefinir o link?\nIsso quebrará todos os vínculos atuais.\n\nESTA AÇÃO É IRREVERSÍVEL❗"", - ""delete-resource"": ""Deletar recurso"", - ""linked-amount"": ""Quantidade de vínculos"", - ""warning-text"": ""Tem certeza de que deseja deletar este recurso?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", - ""warning-text-unused"": ""Tem certeza de que deseja deletar este recurso não utilizado?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", - ""no-unused-resources"": ""Nenhum recurso não utilizado"", - ""delete-selected-resources"": ""Deletar recursos selecionados"", - ""no-files-selected"": ""Nenhum arquivo selecionado❗"", - ""upload-successfully"": ""Carregado com êxito"", - ""file-drag-drop-prompt"": ""Arraste e solte o arquivo aqui para carregá-lo"", - ""search-bar-placeholder"": ""Pesquisar recurso"", - ""clear"": ""Clear"", - ""create-dialog"": { - ""title"": ""Criar recurso"", - ""upload-method"": ""Método de carregamento"", - ""local-file"": { - ""option"": ""Arquivo local"", - ""choose"": ""Escolher arquivo"" - }, - ""external-link"": { - ""option"": ""Link externo"", - ""link"": ""Link"", - ""link-placeholder"": ""https://o.link.para/seu/recurso"", - ""file-name"": ""Nome"", - ""file-name-placeholder"": ""Nome do arquivo"", - ""type"": ""Tipo"", - ""type-placeholder"": ""Tipo do arquivo"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""Insira `#tag` para criar uma nova"", - ""create-tag"": ""Criar Tag"", - ""all-tags"": ""Todas as Tags"", - ""tag-name"": ""NOME_DA_TAG"" - }, - ""daily-review"": { - ""title"": ""Resumo Diário"", - ""no-memos"": ""Não há memos"" - }, - ""setting"": { - ""my-account"": ""Minha conta"", - ""preference"": ""Preferências"", - ""member"": ""Membro"", - ""member-list"": ""Lista de membros"", - ""system"": ""Sistema"", - ""storage"": ""Armazenamento"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""Informação da conta"", - ""username-note"": ""Usado para entrar"", - ""nickname-note"": ""Exibido no banner"", - ""email-note"": ""Opcional"", - ""update-information"": ""Atualizar informações"", - ""change-password"": ""Alterar senha"", - ""reset-api"": ""Redefinir API"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""Redefinir chave OpenAPI"", - ""openapi-reset-warning"": ""❗ A chave de API existente será invalidada e uma nova será gerada.\n\nTem certeza de que deseja redefinir?"", - ""openapi-sample-post"": ""Olá #memos em {{url}}"" + ""editor"": { + ""editing"": ""Editando..."", + ""cancel-edit"": ""Cancelar edição"", + ""save"": ""Salvar"", + ""placeholder"": ""Alguma ideia..."", + ""only-image-supported"": ""Apenas imagens são suportadas"", + ""cant-empty"": ""O conteúdo não pode estar vazio"", + ""local"": ""Local"", + ""resources"": ""Recursos"" }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Visibilidade padrão do memo"", - ""default-resource-visibility"": ""Visibilidade padrão do recurso"", - ""enable-folding-memo"": ""Habilitar recolher memo"", - ""enable-double-click"": ""Habilitar duplo clique para editar"", - ""editor-font-style"": ""Estilo de fonte do editor"", - ""mobile-editor-style"": ""Estilo do editor para dispositivos móveis"", - ""default-memo-sort-option"": ""Memo display time"", - ""created_ts"": ""Hora de criação"", - ""updated_ts"": ""Hora de atualização"", - ""daily-review-time-offset"": ""Compensação de tempo do Resumo Diário"", - ""auto-collapse"": ""Recolher automaticamente"" + ""memo"": { + ""view-detail"": ""Ver detalhes"", + ""copy-link"": ""Copiar link"", + ""embed"": ""Incorporar"", + ""archived-memos"": ""Memos arquivados"", + ""no-archived-memos"": ""Nenhum memo arquivado"", + ""fetching-data"": ""obtendo dados..."", + ""fetch-more"": ""Clique para carregar mais dados"", + ""archived-at"": ""Arquivado em"", + ""search-placeholder"": ""Pesquisar memos"", + ""visibility"": { + ""private"": ""Privado (eu)"", + ""protected"": ""Protegido (membros)"", + ""public"": ""Público (todos)"", + ""disabled"": ""Memos públicos estão desabilitados"" + }, + ""delete-memo"": ""Deletar memo"", + ""delete-confirm"": ""Tem certeza de que deseja deletar este memo?\n\nESTA AÇÃO É IRREVERSÍVEL❗"" }, - ""storage-section"": { - ""current-storage"": ""Armazenamento de objetos atual"", - ""type-database"": ""Banco de dados"", - ""type-local"": ""Local"", - ""storage-services-list"": ""Lista de serviços de armazenamento"", - ""create-a-service"": ""Criar um serviço"", - ""update-a-service"": ""Atualizar um serviço"", - ""warning-text"": ""Tem certeza de que deseja deletar o serviço de armazenamento \""{{name}}\""?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", - ""delete-storage"": ""Deletar armazenamento"", - ""local-storage-path"": ""Caminho do armazenamento local"", - ""update-local-path"": ""Atualizar caminho do armazenamento local"", - ""update-local-path-description"": ""O caminho de armazenamento local é relativo ao seu banco de dados"", - ""create-storage"": ""Criar armazenamento"", - ""update-storage"": ""Atualizar armazenamento"", - ""endpoint"": ""Endpoint"", - ""s3-compatible-url"": ""URL compatível com S3"", - ""region"": ""Região"", - ""region-placeholder"": ""Nome da região"", - ""accesskey"": ""Chave de acesso"", - ""accesskey-placeholder"": ""Chave de acesso / ID de acesso"", - ""secretkey"": ""Chave secreta"", - ""secretkey-placeholder"": ""Chave secreta / Chave de acesso"", - ""bucket"": ""Bucket"", - ""bucket-placeholder"": ""Nome do bucket"", - ""path"": ""Caminho do armazenamento"", - ""path-description"": ""Você pode usar as mesmas variáveis dinâmicas do armazenamento local, como {filename}"", - ""path-placeholder"": ""caminho"", - ""url-prefix"": ""Prefixo da URL"", - ""url-prefix-placeholder"": ""Prefixo personalizado da URL, opcional"", - ""url-suffix"": ""Sufixo da URL"", - ""url-suffix-placeholder"": ""Sufixo personalizado da URL, opcional"" + ""resource"": { + ""no-resources"": ""Nenhum recurso"", + ""fetching-data"": ""obtendo dados..."", + ""copy-link"": ""Copiar link"", + ""reset-link"": ""Redefinir link"", + ""reset-resource-link"": ""Redefinir link do recurso"", + ""reset-link-prompt"": ""Tem certeza de que deseja redefinir o link?\nIsso quebrará todos os vínculos atuais.\n\nESTA AÇÃO É IRREVERSÍVEL❗"", + ""delete-resource"": ""Deletar recurso"", + ""linked-amount"": ""Quantidade de vínculos"", + ""warning-text"": ""Tem certeza de que deseja deletar este recurso?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", + ""warning-text-unused"": ""Tem certeza de que deseja deletar este recurso não utilizado?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", + ""no-unused-resources"": ""Nenhum recurso não utilizado"", + ""delete-selected-resources"": ""Deletar recursos selecionados"", + ""no-files-selected"": ""Nenhum arquivo selecionado❗"", + ""upload-successfully"": ""Carregado com êxito"", + ""file-drag-drop-prompt"": ""Arraste e solte o arquivo aqui para carregá-lo"", + ""search-bar-placeholder"": ""Pesquisar recurso"", + ""clear"": ""Clear"", + ""create-dialog"": { + ""title"": ""Criar recurso"", + ""upload-method"": ""Método de carregamento"", + ""local-file"": { + ""option"": ""Arquivo local"", + ""choose"": ""Escolher arquivo"" + }, + ""external-link"": { + ""option"": ""Link externo"", + ""link"": ""Link"", + ""link-placeholder"": ""https://o.link.para/seu/recurso"", + ""file-name"": ""Nome"", + ""file-name-placeholder"": ""Nome do arquivo"", + ""type"": ""Tipo"", + ""type-placeholder"": ""Tipo do arquivo"" + } + } }, - ""member-section"": { - ""create-a-member"": ""Criar um membro"", - ""archive-member"": ""Arquivar membro"", - ""archive-warning"": ""❗ Tem certeza de que deseja arquivar {{username}}?"", - ""delete-member"": ""Deletar membro"", - ""delete-warning"": ""❗ Tem certeza de que deseja deletar {{username}}?\n\nESTA AÇÃO É IRREVERSÍVEL❗"" + ""tag-list"": { + ""tip-text"": ""Insira `#tag` para criar uma nova"", + ""create-tag"": ""Criar Tag"", + ""all-tags"": ""Todas as Tags"", + ""tag-name"": ""NOME_DA_TAG"" }, - ""system-section"": { - ""server-name"": ""Nome do servidor"", - ""customize-server"": { - ""title"": ""Personalizar Servidor"", - ""default"": ""O padrão é memos"", - ""icon-url"": ""URL do ícone"", - ""description"": ""Descrição"", - ""locale"": ""Localização do servidor"", - ""appearance"": ""Aparência do servidor"" - }, - ""database-file-size"": ""Tamanho do banco de dados"", - ""allow-user-signup"": ""Permitir registro de usuário"", - ""ignore-version-upgrade"": ""Ignorar atualização de versão"", - ""disable-public-memos"": ""Desabilitar memos públicos"", - ""max-upload-size"": ""Tamanho máximo de upload (MiB)"", - ""max-upload-size-hint"": ""O valor recomendado é 32 MiB."", - ""additional-style"": ""Estilo adicional"", - ""additional-script"": ""Script adicional"", - ""additional-style-placeholder"": ""Código CSS adicional"", - ""additional-script-placeholder"": ""Código JavaScript adicional"", - ""openai-api-key"": ""OpenAI: Chave de API"", - ""openai-api-key-description"": ""Obter chave de API"", - ""openai-api-key-placeholder"": ""Sua chave de API da OpenAI"", - ""openai-api-host"": ""OpenAI: Host de API"", - ""openai-api-host-placeholder"": ""Padrão: https://api.openai.com/"", - ""display-with-updated-time"": ""Display with updated time"" + ""daily-review"": { + ""title"": ""Resumo Diário"", + ""no-memos"": ""Não há memos"" }, - ""appearance-option"": { - ""system"": ""Sistema"", - ""light"": ""Claro"", - ""dark"": ""Escuro"" + ""setting"": { + ""my-account"": ""Minha conta"", + ""preference"": ""Preferências"", + ""member"": ""Membro"", + ""member-list"": ""Lista de membros"", + ""system"": ""Sistema"", + ""storage"": ""Armazenamento"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""Informação da conta"", + ""username-note"": ""Usado para entrar"", + ""nickname-note"": ""Exibido no banner"", + ""email-note"": ""Opcional"", + ""update-information"": ""Atualizar informações"", + ""change-password"": ""Alterar senha"", + ""reset-api"": ""Redefinir API"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""Redefinir chave OpenAPI"", + ""openapi-reset-warning"": ""❗ A chave de API existente será invalidada e uma nova será gerada.\n\nTem certeza de que deseja redefinir?"", + ""openapi-sample-post"": ""Olá #memos em {{url}}"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Visibilidade padrão do memo"", + ""default-resource-visibility"": ""Visibilidade padrão do recurso"", + ""enable-folding-memo"": ""Habilitar recolher memo"", + ""enable-double-click"": ""Habilitar duplo clique para editar"", + ""editor-font-style"": ""Estilo de fonte do editor"", + ""mobile-editor-style"": ""Estilo do editor para dispositivos móveis"", + ""default-memo-sort-option"": ""Memo display time"", + ""created_ts"": ""Hora de criação"", + ""updated_ts"": ""Hora de atualização"", + ""daily-review-time-offset"": ""Compensação de tempo do Resumo Diário"", + ""auto-collapse"": ""Recolher automaticamente"" + }, + ""storage-section"": { + ""current-storage"": ""Armazenamento de objetos atual"", + ""type-database"": ""Banco de dados"", + ""type-local"": ""Local"", + ""storage-services-list"": ""Lista de serviços de armazenamento"", + ""create-a-service"": ""Criar um serviço"", + ""update-a-service"": ""Atualizar um serviço"", + ""warning-text"": ""Tem certeza de que deseja deletar o serviço de armazenamento \""{{name}}\""?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", + ""delete-storage"": ""Deletar armazenamento"", + ""local-storage-path"": ""Caminho do armazenamento local"", + ""update-local-path"": ""Atualizar caminho do armazenamento local"", + ""update-local-path-description"": ""O caminho de armazenamento local é relativo ao seu banco de dados"", + ""create-storage"": ""Criar armazenamento"", + ""update-storage"": ""Atualizar armazenamento"", + ""endpoint"": ""Endpoint"", + ""s3-compatible-url"": ""URL compatível com S3"", + ""region"": ""Região"", + ""region-placeholder"": ""Nome da região"", + ""accesskey"": ""Chave de acesso"", + ""accesskey-placeholder"": ""Chave de acesso / ID de acesso"", + ""secretkey"": ""Chave secreta"", + ""secretkey-placeholder"": ""Chave secreta / Chave de acesso"", + ""bucket"": ""Bucket"", + ""bucket-placeholder"": ""Nome do bucket"", + ""path"": ""Caminho do armazenamento"", + ""path-description"": ""Você pode usar as mesmas variáveis dinâmicas do armazenamento local, como {filename}"", + ""path-placeholder"": ""caminho"", + ""url-prefix"": ""Prefixo da URL"", + ""url-prefix-placeholder"": ""Prefixo personalizado da URL, opcional"", + ""url-suffix"": ""Sufixo da URL"", + ""url-suffix-placeholder"": ""Sufixo personalizado da URL, opcional"" + }, + ""member-section"": { + ""create-a-member"": ""Criar um membro"", + ""archive-member"": ""Arquivar membro"", + ""archive-warning"": ""❗ Tem certeza de que deseja arquivar {{username}}?"", + ""delete-member"": ""Deletar membro"", + ""delete-warning"": ""❗ Tem certeza de que deseja deletar {{username}}?\n\nESTA AÇÃO É IRREVERSÍVEL❗"" + }, + ""system-section"": { + ""server-name"": ""Nome do servidor"", + ""customize-server"": { + ""title"": ""Personalizar Servidor"", + ""default"": ""O padrão é memos"", + ""icon-url"": ""URL do ícone"", + ""description"": ""Descrição"", + ""locale"": ""Localização do servidor"", + ""appearance"": ""Aparência do servidor"" + }, + ""database-file-size"": ""Tamanho do banco de dados"", + ""allow-user-signup"": ""Permitir registro de usuário"", + ""ignore-version-upgrade"": ""Ignorar atualização de versão"", + ""disable-public-memos"": ""Desabilitar memos públicos"", + ""max-upload-size"": ""Tamanho máximo de upload (MiB)"", + ""max-upload-size-hint"": ""O valor recomendado é 32 MiB."", + ""additional-style"": ""Estilo adicional"", + ""additional-script"": ""Script adicional"", + ""additional-style-placeholder"": ""Código CSS adicional"", + ""additional-script-placeholder"": ""Código JavaScript adicional"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Sistema"", + ""light"": ""Claro"", + ""dark"": ""Escuro"" + }, + ""sso-section"": { + ""sso-list"": ""Lista de SSOs (Login Único)"", + ""delete-sso"": ""Confirmar exclusão"", + ""confirm-delete"": ""Tem certeza de que deseja excluir a configuração SSO \""{{name}}\""?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", + ""create-sso"": ""Criar SSO"", + ""update-sso"": ""Atualizar SSO"", + ""sso-created"": ""SSO {{name}} criado"", + ""sso-updated"": ""SSO {{name}} atualizado"", + ""identifier"": ""Identificador"", + ""display-name"": ""Nome de exibição"", + ""template"": ""Modelo"", + ""custom"": ""Personalizado"", + ""identifier-filter"": ""Filtro identificador"", + ""redirect-url"": ""URL de redirecionamento"", + ""client-id"": ""ID do cliente"", + ""client-secret"": ""Segredo do cliente"", + ""authorization-endpoint"": ""Endpoint de autenticação"", + ""token-endpoint"": ""Endpoint de token"", + ""user-endpoint"": ""Endpoint do usuário"", + ""scopes"": ""Escopos"" + } }, - ""sso-section"": { - ""sso-list"": ""Lista de SSOs (Login Único)"", - ""delete-sso"": ""Confirmar exclusão"", - ""confirm-delete"": ""Tem certeza de que deseja excluir a configuração SSO \""{{name}}\""?\n\nESTA AÇÃO É IRREVERSÍVEL❗"", - ""create-sso"": ""Criar SSO"", - ""update-sso"": ""Atualizar SSO"", - ""sso-created"": ""SSO {{name}} criado"", - ""sso-updated"": ""SSO {{name}} atualizado"", - ""identifier"": ""Identificador"", - ""display-name"": ""Nome de exibição"", - ""template"": ""Modelo"", - ""custom"": ""Personalizado"", - ""identifier-filter"": ""Filtro identificador"", - ""redirect-url"": ""URL de redirecionamento"", - ""client-id"": ""ID do cliente"", - ""client-secret"": ""Segredo do cliente"", - ""authorization-endpoint"": ""Endpoint de autenticação"", - ""token-endpoint"": ""Endpoint de token"", - ""user-endpoint"": ""Endpoint do usuário"", - ""scopes"": ""Escopos"" - } - }, - ""filter"": { - ""new-filter"": ""Novo filtro"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Tipo"", - ""text"": ""Texto"", - ""display-time"": ""Hora de exibição"", - ""visibility"": ""Visibilidade"" + ""message"": { + ""no-data"": ""Talvez nenhum dado tenha sido encontrado ou talvez devesse ser outra opção."", + ""memos-ready"": ""todos os memos estão prontos 🎉"", + ""resource-ready"": ""todos os recursos estão prontos 🎉"", + ""restored-successfully"": ""Restaurado com êxito"", + ""memo-updated-datetime"": ""Data do memo atualizada"", + ""invalid-created-datetime"": ""Data de criação inválida"", + ""change-memo-created-time"": ""Alterar data de criação do memo"", + ""change-memo-created-time-warning-1"": ""ESTE NÃO É UM PROCEDIMENTO RECOMENDADO."", + ""change-memo-created-time-warning-2"": ""Esteja certo de que realmente precisa disso."", + ""memo-not-found"": ""Memo não encontrado"", + ""fill-all"": ""Por favor, preencha todos os campos"", + ""password-not-match"": ""As senhas não coincidem"", + ""new-password-not-match"": ""As novas senhas não coincidem"", + ""image-load-failed"": ""Falha ao carregar a imagem"", + ""fill-form"": ""Por favor, preencha o formulário"", + ""fill-server-name"": ""Por favor, preencha o nome do servidor"", + ""login-failed"": ""Falha no login"", + ""signup-failed"": ""Falha no registro"", + ""user-not-found"": ""Usuário não encontrado"", + ""password-changed"": ""Senha alterada"", + ""private-only"": ""Este memo é privado"", + ""copied"": ""Copiado"", + ""succeed-copy-content"": ""Conteúdo copiado com êxito."", + ""succeed-copy-code"": ""Código copiado com êxito."", + ""succeed-copy-link"": ""Link copiado com êxito."", + ""change-resource-filename"": ""Alterar nome do arquivo do recurso"", + ""resource-filename-updated"": ""Nome do arquivo do recurso atualizado"", + ""invalid-resource-filename"": ""Nome de arquivo de recurso inválido"", + ""click-to-save-the-image"": ""Clique para salvar a imagem"", + ""generating-the-screenshot"": ""Gerando a captura de tela..."", + ""count-selected-resources"": ""Total selecionado"", + ""succeed-vacuum-database"": ""Banco de dados compactado com êxito."", + ""succeed-update-additional-style"": ""Folha de estilos adicional atualizada com êxito."", + ""succeed-copy-resource-link"": ""Link do recurso copiado com êxito."", + ""succeed-update-customized-profile"": ""Perfil personalizado com êxito."", + ""succeed-update-additional-script"": ""Script adicional atualizado com êxito."", + ""update-succeed"": ""Atualizado com êxito"", + ""page-not-found"": ""404 - Página não encontrada 😥"", + ""maximum-upload-size-is"": ""O tamanho máximo permitido para upload é {{size}} MiB"", + ""file-exceeds-upload-limit-of"": ""O arquivo {{file}} excede o limite de upload de {{size}} MiB"" }, - ""operator"": { - ""contains"": ""Contém"", - ""not-contains"": ""Não contém"", - ""is"": ""É"", - ""is-not"": ""Não É"", - ""before"": ""Antes"", - ""after"": ""Depois"" + ""days"": { + ""mon"": ""Seg"", + ""tue"": ""Ter"", + ""wed"": ""Qua"", + ""thu"": ""Qui"", + ""fri"": ""Sex"", + ""sat"": ""Sáb"", + ""sun"": ""Dom"" }, - ""value"": { - ""not-tagged"": ""Sem tags"", - ""linked"": ""Tem links"", - ""has-attachment"": ""Tem anexos"" + ""embed-memo"": { + ""title"": ""Incorporar memo"", + ""text"": ""Copie o código abaixo para incorporar este memo em seu site."", + ""only-public-supported"": ""* Somente memos públicos podem ser incorporados."", + ""copy"": ""Copiar"" }, - ""text-placeholder"": ""Inicie com ^ para usar regex"", - ""and"": ""E"", - ""or"": ""Ou"" - }, - ""message"": { - ""no-data"": ""Talvez nenhum dado tenha sido encontrado ou talvez devesse ser outra opção."", - ""no-memos"": ""nenhum memo 🌃"", - ""memos-ready"": ""todos os memos estão prontos 🎉"", - ""no-resource"": ""nenhum recurso 🌃"", - ""resource-ready"": ""todos os recursos estão prontos 🎉"", - ""restored-successfully"": ""Restaurado com êxito"", - ""memo-updated-datetime"": ""Data do memo atualizada"", - ""invalid-created-datetime"": ""Data de criação inválida"", - ""change-memo-created-time"": ""Alterar data de criação do memo"", - ""change-memo-created-time-warning-1"": ""ESTE NÃO É UM PROCEDIMENTO RECOMENDADO."", - ""change-memo-created-time-warning-2"": ""Esteja certo de que realmente precisa disso."", - ""memo-not-found"": ""Memo não encontrado"", - ""fill-all"": ""Por favor, preencha todos os campos"", - ""password-not-match"": ""As senhas não coincidem"", - ""new-password-not-match"": ""As novas senhas não coincidem"", - ""image-load-failed"": ""Falha ao carregar a imagem"", - ""fill-form"": ""Por favor, preencha o formulário"", - ""fill-server-name"": ""Por favor, preencha o nome do servidor"", - ""login-failed"": ""Falha no login"", - ""signup-failed"": ""Falha no registro"", - ""user-not-found"": ""Usuário não encontrado"", - ""password-changed"": ""Senha alterada"", - ""private-only"": ""Este memo é privado"", - ""copied"": ""Copiado"", - ""succeed-copy-content"": ""Conteúdo copiado com êxito."", - ""succeed-copy-code"": ""Código copiado com êxito."", - ""succeed-copy-link"": ""Link copiado com êxito."", - ""change-resource-filename"": ""Alterar nome do arquivo do recurso"", - ""resource-filename-updated"": ""Nome do arquivo do recurso atualizado"", - ""invalid-resource-filename"": ""Nome de arquivo de recurso inválido"", - ""click-to-save-the-image"": ""Clique para salvar a imagem"", - ""generating-the-screenshot"": ""Gerando a captura de tela..."", - ""count-selected-resources"": ""Total selecionado"", - ""too-short"": ""Muito curto"", - ""too-long"": ""Muito longo"", - ""not-allow-space"": ""Espaços não são permitidos"", - ""not-allow-chinese"": ""Caracteres chineses não são permitidos"", - ""succeed-vacuum-database"": ""Banco de dados compactado com êxito."", - ""succeed-update-additional-style"": ""Folha de estilos adicional atualizada com êxito."", - ""succeed-copy-resource-link"": ""Link do recurso copiado com êxito."", - ""succeed-update-customized-profile"": ""Perfil personalizado com êxito."", - ""succeed-update-additional-script"": ""Script adicional atualizado com êxito."", - ""update-succeed"": ""Atualizado com êxito"", - ""page-not-found"": ""404 - Página não encontrada 😥"", - ""maximum-upload-size-is"": ""O tamanho máximo permitido para upload é {{size}} MiB"", - ""file-exceeds-upload-limit-of"": ""O arquivo {{file}} excede o limite de upload de {{size}} MiB"" - }, - ""days"": { - ""mon"": ""Seg"", - ""tue"": ""Ter"", - ""wed"": ""Qua"", - ""thu"": ""Qui"", - ""fri"": ""Sex"", - ""sat"": ""Sáb"", - ""sun"": ""Dom"" - }, - ""ask-ai"": { - ""title"": ""Pergunte a IA"", - ""not-enabled"": ""Você não configurou a chave de API da OpenAI."", - ""go-to-settings"": ""Ir para configurações"", - ""placeholder"": ""Pergunte qualquer coisa para a IA..."" - }, - ""embed-memo"": { - ""title"": ""Incorporar memo"", - ""text"": ""Copie o código abaixo para incorporar este memo em seu site."", - ""only-public-supported"": ""* Somente memos públicos podem ser incorporados."", - ""copy"": ""Copiar"" - }, - ""heatmap"": { - ""memo-in"": ""memo em {{period}}"", - ""memos-in"": ""memos em {{period}}"", - ""memo-on"": ""{{amount}} memo em {{date}}"", - ""memos-on"": ""{{amount}} memos em {{date}}"", - ""day"": ""dia"", - ""days"": ""dias"" - }, - ""about"": { - ""about-memos"": ""Sobre o Memos"", - ""memos-description"": ""Memos é um aplicativo de bloco de notas baseado na web que você pode usar para escrever, organizar e compartilhar anotações."", - ""no-server-description"": ""Nenhuma descrição configurada para este servidor."", - ""powered-by"": ""Provido por"", - ""other-projects"": ""Outros projetos"" - } + ""heatmap"": { + ""memo-in"": ""memo em {{period}}"", + ""memos-in"": ""memos em {{period}}"", + ""memo-on"": ""{{amount}} memo em {{date}}"", + ""memos-on"": ""{{amount}} memos em {{date}}"", + ""day"": ""dia"", + ""days"": ""dias"" + }, + ""about"": { + ""about-memos"": ""Sobre o Memos"", + ""memos-description"": ""Memos é um aplicativo de bloco de notas baseado na web que você pode usar para escrever, organizar e compartilhar anotações."", + ""no-server-description"": ""Nenhuma descrição configurada para este servidor."", + ""powered-by"": ""Provido por"", + ""other-projects"": ""Outros projetos"" + } } diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index 7df85dce57abd..d090ae9bf12b8 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -1,459 +1,349 @@ { - ""common"": { - ""memos-slogan"": ""Легкий, self-hosted сервис заметок. С открытым исходным кодом и навсегда бесплатный."", - ""about"": ""О Memos"", - ""home"": ""Главная"", - ""daily-review"": ""По дням"", - ""resources"": ""Ресурсы"", - ""ask-ai"": ""Спросить ИИ"", - ""archived"": ""В архиве"", - ""email"": ""Email"", - ""password"": ""Пароль"", - ""repeat-password-short"": ""Повторить"", - ""repeat-password"": ""Повторить пароль"", - ""new-password"": ""Новый пароль"", - ""repeat-new-password"": ""Повторить новый пароль"", - ""username"": ""Имя"", - ""nickname"": ""Псевдоним"", - ""save"": ""Сохранить"", - ""close"": ""Закрыть"", - ""cancel"": ""Отменить"", - ""create"": ""Создать"", - ""update"": ""Изменить"", - ""change"": ""Заменить"", - ""confirm"": ""Подтвердить"", - ""reset"": ""Сбросить"", - ""language"": ""Язык"", - ""version"": ""Версия"", - ""pin"": ""Закрепить"", - ""unpin"": ""Открепить"", - ""edit"": ""Редактировать"", - ""restore"": ""Восстановить"", - ""delete"": ""Удалить"", - ""null"": ""Пусто"", - ""share"": ""Поделиться"", - ""archive"": ""Архивировать"", - ""basic"": ""Базовые"", - ""admin"": ""Администратор"", - ""explore"": ""Обзор"", - ""sign-in"": ""Войти"", - ""sign-in-with"": ""Войти через {{provider}}"", - ""or"": ""или"", - ""sign-up"": ""Зарегистрироваться"", - ""sign-out"": ""Выйти"", - ""back-to-home"": ""Вернуться на главную"", - ""type"": ""Тип"", - ""title"": ""Заголовок"", - ""filter"": ""Фильтр"", - ""filter-period"": ""{{from}} по {{to}}"", - ""tags"": ""Теги"", - ""yourself"": ""Вы"", - ""archived-at"": ""Архив"", - ""changed"": ""изменено"", - ""update-on"": ""Обновлено"", - ""fold"": ""Свернуть"", - ""expand"": ""Развернуть"", - ""image"": ""Изображение"", - ""link"": ""Ссылка"", - ""vacuum"": ""Сжать"", - ""select"": ""Выбрать"", - ""avatar"": ""Аватар"", - ""database"": ""База данных"", - ""settings"": ""Настройки"", - ""upload"": ""Загрузить"", - ""preview"": ""Предпросмотр"", - ""rename"": ""Переименовать"", - ""clear"": ""Очистить"", - ""name"": ""Название"", - ""visibility"": ""Видимость"", - ""learn-more"": ""Узнать больше"", - ""new"": ""Новая запись"", - ""dialog"": { - ""error"": ""Ошибка"", - ""help"": ""Помощь"", - ""info"": ""Информация"", - ""success"": ""Успешно"", - ""warning"": ""Предупреждение"" - }, - ""beta"": ""Beta"", - ""mark"": ""Связать"" - }, - ""router"": { - ""back-to-home"": ""Вернуться на главную"" - }, - ""auth"": { - ""signup-as-host"": ""Зарегистрироваться как владелец"", - ""host-tip"": ""Вы регистрируете владельца сайта."", - ""not-host-tip"": ""Если у вас нет аккаунта, обратитесь к владельцу сайта."", - ""new-password"": ""Новый пароль"", - ""repeat-new-password"": ""Повторить новый пароль"" - }, - ""sidebar"": { - ""daily-review"": ""По дням"", - ""resources"": ""Ресурсы"", - ""setting"": ""Настройки"", - ""archived"": ""Заархивировано"" - }, - ""resource"": { - ""description"": ""Посмотреть ваши статические ресурсы в Memos (изображения и пр.)"", - ""no-resources"": ""Нет ресурсов."", - ""fetching-data"": ""загрузка данных..."", - ""upload"": ""Загрузить"", - ""preview"": ""Предпросмотр"", - ""copy-link"": ""Скопировать ссылку"", - ""reset-link"": ""Удалить ссылку"", - ""reset-resource-link"": ""Удаление ссылки на ресурс"", - ""reset-link-prompt"": ""Вы уверены, что хотите удалить ссылку? Все использования этой ссылки будут сломаны.\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", - ""delete-resource"": ""Удалить ресурс"", - ""warning-text"": ""Вы уверены, что хотите выбранные ресурсы?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", - ""linked-amount"": ""Количество записей"", - ""rename"": ""Переименовать"", - ""warning-text-unused"": ""Вы уверены, что хотите удалить неиспользуемые ресурсы?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", - ""no-unused-resources"": ""Нет неиспользуемых ресурсов"", - ""delete-selected-resources"": ""Удаление выбранных ресурсов"", - ""no-files-selected"": ""Нет выбранных файлов❗"", - ""upload-successfully"": ""Загрузка окончена"", - ""file-drag-drop-prompt"": ""Перетащите ваш файл сюда, чтобы загрузить его"", - ""name"": ""Название"", - ""clear"": ""Удалить неиспользуемые"", - ""search-bar-placeholder"": ""Поиск ресурсов"", - ""select"": ""Выбрать"", - ""create-dialog"": { - ""title"": ""Создать ресурс"", - ""upload-method"": ""Способ загрузки"", - ""local-file"": { - ""option"": ""Локальный файл"", - ""choose"": ""Выберите файл..."" - }, - ""external-link"": { - ""option"": ""Внешняя ссылка"", - ""link"": ""Ссылка"", - ""file-name"": ""Название файла"", - ""file-name-placeholder"": ""Название файла"", + ""common"": { + ""about"": ""О Memos"", + ""home"": ""Главная"", + ""resources"": ""Ресурсы"", + ""archived"": ""В архиве"", + ""email"": ""Email"", + ""password"": ""Пароль"", + ""username"": ""Имя"", + ""nickname"": ""Псевдоним"", + ""save"": ""Сохранить"", + ""close"": ""Закрыть"", + ""cancel"": ""Отменить"", + ""create"": ""Создать"", + ""update"": ""Изменить"", + ""change"": ""Заменить"", + ""confirm"": ""Подтвердить"", + ""reset"": ""Сбросить"", + ""language"": ""Язык"", + ""version"": ""Версия"", + ""pin"": ""Закрепить"", + ""unpin"": ""Открепить"", + ""edit"": ""Редактировать"", + ""restore"": ""Восстановить"", + ""delete"": ""Удалить"", + ""null"": ""Пусто"", + ""share"": ""Поделиться"", + ""archive"": ""Архивировать"", + ""basic"": ""Базовые"", + ""admin"": ""Администратор"", + ""explore"": ""Обзор"", + ""sign-in"": ""Войти"", + ""sign-in-with"": ""Войти через {{provider}}"", + ""or"": ""или"", + ""sign-up"": ""Зарегистрироваться"", + ""sign-out"": ""Выйти"", ""type"": ""Тип"", - ""type-placeholder"": ""Тип файла"", - ""link-placeholder"": ""https://the.link.to/your/resource"" - } - } - }, - ""archived"": { - ""archived-memos"": ""Заархивированные записи"", - ""no-archived-memos"": ""Нет заархивированных записей."", - ""fetching-data"": ""загрузка данных..."" - }, - ""editor"": { - ""editing"": ""Редактирование..."", - ""cancel-edit"": ""Отменить"", - ""save"": ""Сохранить"", - ""placeholder"": ""Ваши мысли..."", - ""only-image-supported"": ""Поддерживаются только изображения."", - ""cant-empty"": ""Содержимое не может быть пустым"", - ""local"": ""На устройстве"", - ""resources"": ""Ресурсы"" - }, - ""memo"": { - ""view-detail"": ""Подробно"", - ""copy"": ""Копировать"", - ""copy-link"": ""Скопировать ссылку"", - ""embed"": ""Встроить запись"", - ""archived-memos"": ""Заархивированные записи"", - ""no-archived-memos"": ""Нет заархивированных записей."", - ""fetching-data"": ""загрузка данных..."", - ""fetch-more"": ""Загрузить больше"", - ""archived-at"": ""Архив"", - ""search-placeholder"": ""Поиск записей"", - ""visibility"": { - ""private"": ""Видно только вам"", - ""protected"": ""Видно только пользователям"", - ""public"": ""Видно всем"", - ""disabled"": ""Публичные записи отключены"" + ""title"": ""Заголовок"", + ""filter"": ""Фильтр"", + ""filter-period"": ""{{from}} по {{to}}"", + ""tags"": ""Теги"", + ""yourself"": ""Вы"", + ""changed"": ""изменено"", + ""fold"": ""Свернуть"", + ""expand"": ""Развернуть"", + ""image"": ""Изображение"", + ""link"": ""Ссылка"", + ""vacuum"": ""Сжать"", + ""select"": ""Выбрать"", + ""avatar"": ""Аватар"", + ""database"": ""База данных"", + ""settings"": ""Настройки"", + ""upload"": ""Загрузить"", + ""preview"": ""Предпросмотр"", + ""rename"": ""Переименовать"", + ""clear"": ""Очистить"", + ""name"": ""Название"", + ""visibility"": ""Видимость"", + ""learn-more"": ""Узнать больше"", + ""new"": ""Новая запись"", + ""beta"": ""Beta"", + ""mark"": ""Связать"" + }, + ""auth"": { + ""host-tip"": ""Вы регистрируете владельца сайта."", + ""new-password"": ""Новый пароль"", + ""repeat-new-password"": ""Повторить новый пароль"" + }, + ""resource"": { + ""no-resources"": ""Нет ресурсов."", + ""fetching-data"": ""загрузка данных..."", + ""copy-link"": ""Скопировать ссылку"", + ""reset-link"": ""Удалить ссылку"", + ""reset-resource-link"": ""Удаление ссылки на ресурс"", + ""reset-link-prompt"": ""Вы уверены, что хотите удалить ссылку? Все использования этой ссылки будут сломаны.\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", + ""delete-resource"": ""Удалить ресурс"", + ""warning-text"": ""Вы уверены, что хотите выбранные ресурсы?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", + ""linked-amount"": ""Количество записей"", + ""warning-text-unused"": ""Вы уверены, что хотите удалить неиспользуемые ресурсы?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", + ""no-unused-resources"": ""Нет неиспользуемых ресурсов"", + ""delete-selected-resources"": ""Удаление выбранных ресурсов"", + ""no-files-selected"": ""Нет выбранных файлов❗"", + ""upload-successfully"": ""Загрузка окончена"", + ""file-drag-drop-prompt"": ""Перетащите ваш файл сюда, чтобы загрузить его"", + ""clear"": ""Удалить неиспользуемые"", + ""search-bar-placeholder"": ""Поиск ресурсов"", + ""create-dialog"": { + ""title"": ""Создать ресурс"", + ""upload-method"": ""Способ загрузки"", + ""local-file"": { + ""option"": ""Локальный файл"", + ""choose"": ""Выберите файл..."" + }, + ""external-link"": { + ""option"": ""Внешняя ссылка"", + ""link"": ""Ссылка"", + ""file-name"": ""Название файла"", + ""file-name-placeholder"": ""Название файла"", + ""type"": ""Тип"", + ""type-placeholder"": ""Тип файла"", + ""link-placeholder"": ""https://the.link.to/your/resource"" + } + } + }, + ""editor"": { + ""editing"": ""Редактирование..."", + ""cancel-edit"": ""Отменить"", + ""save"": ""Сохранить"", + ""placeholder"": ""Ваши мысли..."", + ""only-image-supported"": ""Поддерживаются только изображения."", + ""cant-empty"": ""Содержимое не может быть пустым"", + ""local"": ""На устройстве"", + ""resources"": ""Ресурсы"" }, - ""delete-memo"": ""Удаление записи"", - ""delete-confirm"": ""Вы уверены, что хотите удалить эту запись?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"" - }, - ""memo-list"": { - ""fetching-data"": ""загрузка данных..."", - ""fetch-more"": ""Загрузить больше"" - }, - ""filter"": { - ""new-filter"": ""Новый фильтр"", - ""type"": { - ""tag"": ""Тег"", - ""type"": ""Тип"", - ""text"": ""Текст"", - ""display-time"": ""Время отображения"", - ""visibility"": ""Видимость"" + ""memo"": { + ""view-detail"": ""Подробно"", + ""copy-link"": ""Скопировать ссылку"", + ""embed"": ""Встроить запись"", + ""archived-memos"": ""Заархивированные записи"", + ""no-archived-memos"": ""Нет заархивированных записей."", + ""fetching-data"": ""загрузка данных..."", + ""fetch-more"": ""Загрузить больше"", + ""archived-at"": ""Архив"", + ""search-placeholder"": ""Поиск записей"", + ""visibility"": { + ""private"": ""Видно только вам"", + ""protected"": ""Видно только пользователям"", + ""public"": ""Видно всем"", + ""disabled"": ""Публичные записи отключены"" + }, + ""delete-memo"": ""Удаление записи"", + ""delete-confirm"": ""Вы уверены, что хотите удалить эту запись?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"" }, - ""operator"": { - ""contains"": ""Содержит"", - ""not-contains"": ""Не содержит"", - ""is"": ""Только"", - ""is-not"": ""Кроме"", - ""before"": ""До"", - ""after"": ""После"" + ""tag-list"": { + ""tip-text"": ""Введите `#tag` для создания"", + ""create-tag"": ""Создать тег"", + ""all-tags"": ""Все теги"", + ""tag-name"": ""Тег"" }, - ""value"": { - ""not-tagged"": ""Без тегов"", - ""linked"": ""Содержит ссылки"", - ""has-attachment"": ""Содержит вложения"" + ""daily-review"": { + ""title"": ""По дням"", + ""no-memos"": ""Записей нет."" }, - ""text-placeholder"": ""Начните с ^ чтобы использовать регулярные выражения"", - ""and"": ""И"", - ""or"": ""Или"" - }, - ""tag-list"": { - ""tip-text"": ""Введите `#tag` для создания"", - ""create-tag"": ""Создать тег"", - ""all-tags"": ""Все теги"", - ""tag-name"": ""Тег"" - }, - ""daily-review"": { - ""title"": ""По дням"", - ""no-memos"": ""Записей нет."" - }, - ""search"": { - ""quickly-filter"": ""Быстрый фильтр"" - }, - ""search-bar"": { - ""input-placeholder"": ""Поиск заметок"" - }, - ""setting"": { - ""my-account"": ""Мой аккаунт"", - ""preference"": ""Настройки"", - ""member"": ""Пользователи"", - ""member-list"": ""Список пользователей"", - ""system"": ""Системные"", - ""account-section"": { - ""title"": ""Информация об аккаунте"", - ""update-information"": ""Обновить информацию"", - ""change-password"": ""Изменить пароль"", - ""username-note"": ""Используется для входа"", - ""nickname-note"": ""Отображается на баннере"", - ""email-note"": ""Опционально"", - ""reset-api"": ""Очистить API"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""Очистить ключ OpenAPI"", - ""openapi-reset-warning"": ""❗ Существующий API будет признан недействительным и будет сгенерирован новый.\n\nВы уверены, что хотите выполнить сброс?"", - ""openapi-sample-post"": ""Привет #memos от {{url}}"" + ""setting"": { + ""my-account"": ""Мой аккаунт"", + ""preference"": ""Настройки"", + ""member"": ""Пользователи"", + ""member-list"": ""Список пользователей"", + ""system"": ""Системные"", + ""account-section"": { + ""title"": ""Информация об аккаунте"", + ""update-information"": ""Обновить информацию"", + ""change-password"": ""Изменить пароль"", + ""username-note"": ""Используется для входа"", + ""nickname-note"": ""Отображается на баннере"", + ""email-note"": ""Опционально"", + ""reset-api"": ""Очистить API"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""Очистить ключ OpenAPI"", + ""openapi-reset-warning"": ""❗ Существующий API будет признан недействительным и будет сгенерирован новый.\n\nВы уверены, что хотите выполнить сброс?"", + ""openapi-sample-post"": ""Привет #memos от {{url}}"" + }, + ""preference-section"": { + ""theme"": ""Тема"", + ""default-memo-visibility"": ""Видимость записей по умолчанию"", + ""default-resource-visibility"": ""Видимость ресурсов по умолчанию"", + ""enable-folding-memo"": ""Включить сворачивание записей"", + ""editor-font-style"": ""Стиль шрифта"", + ""mobile-editor-style"": ""Стиль мобильного редактора"", + ""default-memo-sort-option"": ""Отображаемое время записи"", + ""created_ts"": ""Время создания"", + ""updated_ts"": ""Время обновления"", + ""enable-double-click"": ""Разрешить двойной клик для редактирования"", + ""daily-review-time-offset"": ""Смещение времени ежедневного просмотра"", + ""auto-collapse"": ""Автоматическое свертывание"", + ""telegram-user-id"": ""ID пользователя Telegram"", + ""telegram-user-id-placeholder"": ""Отправьте любое сообщение своему Telegram-боту, чтобы узнать ID"" + }, + ""member-section"": { + ""create-a-member"": ""Создать"", + ""archive-member"": ""Деактивировать"", + ""archive-warning"": ""❗ Вы уверены, что хотите деактивировать пользователя {{username}}?"", + ""delete-member"": ""Удалить"", + ""delete-warning"": ""❗ Вы уверены, что хотите удалить пользователя {{username}}?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"" + }, + ""system-section"": { + ""server-name"": ""Имя сервера"", + ""customize-server"": { + ""title"": ""Настроить сервер"", + ""default"": ""По умолчанию: memos"", + ""icon-url"": ""URL иконки"", + ""description"": ""Описание"", + ""locale"": ""Язык"", + ""appearance"": ""Тема"" + }, + ""database-file-size"": ""Размер файла базы данных"", + ""allow-user-signup"": ""Разрешить регистрацию пользователей"", + ""additional-style"": ""Настраиваемый стиль"", + ""additional-script"": ""Настраиваемый скрипт"", + ""additional-style-placeholder"": ""Настраиваемый код CSS"", + ""additional-script-placeholder"": ""Настраиваемый код JavaScript"", + ""disable-public-memos"": ""Отключить публичные записи"", + ""ignore-version-upgrade"": ""Игнорировать версию"", + ""max-upload-size"": ""Максимальный размер загрузки (МБ)"", + ""max-upload-size-hint"": ""Рекомендуемое значение 32 MБ."", + ""telegram-bot-token"": ""Токен Telegram бота"", + ""telegram-bot-token-description"": ""Токен Telegram бота или прокси API вида `http.../bot`"", + ""telegram-bot-token-placeholder"": ""Ваш токен Telegram бота"", + ""display-with-updated-time"": ""Отображать время обновления записи"" + }, + ""appearance-option"": { + ""system"": ""Системная"", + ""light"": ""Светлая"", + ""dark"": ""Тёмная"" + }, + ""storage"": ""Хранилище"", + ""sso"": ""SSO"", + ""storage-section"": { + ""storage-services-list"": ""Список хранилищ"", + ""create-a-service"": ""Создать сервис"", + ""update-a-service"": ""Обновить сервис"", + ""warning-text"": ""Вы уверены, что хотите удалить это хранилище?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", + ""delete-storage"": ""Удалить Хранилище"", + ""current-storage"": ""Текущее объектное хранилище"", + ""type-database"": ""База данных"", + ""type-local"": ""Локальное хранилище"", + ""local-storage-path"": ""Путь к локальному хранилищу"", + ""update-local-path"": ""Обновить путь к локальному хранилищу"", + ""update-local-path-description"": ""Путь к локальному хранилищу - это относительный путь к файлу вашей базы данных"", + ""create-storage"": ""Создать хранилище"", + ""update-storage"": ""Обновить хранилище"", + ""s3-compatible-url"": ""S3 совместимый URL"", + ""region"": ""Регион"", + ""region-placeholder"": ""Название региона"", + ""path"": ""Путь к хранилищу"", + ""path-description"": ""Вы можете использовать переменные от локального хранилища, например {filename}"", + ""url-prefix"": ""Префикс URL"", + ""bucket"": ""Корзина"", + ""accesskey-placeholder"": ""Ключ доступа / идентификатор доступа"", + ""accesskey"": ""Ключ доступа"", + ""secretkey"": ""Секретный ключ"", + ""url-suffix"": ""суффикс URL"", + ""secretkey-placeholder"": ""Секретный ключ / ключ доступа"", + ""bucket-placeholder"": ""Название корзины"", + ""endpoint"": ""Конечная точка"", + ""url-prefix-placeholder"": ""Пользовательский префикс URL, необязательно"", + ""path-placeholder"": ""пользовательский/путь"", + ""url-suffix-placeholder"": ""Пользовательский суффикс URL, необязательно"" + }, + ""sso-section"": { + ""sso-created"": ""SSO {{name}} создана"", + ""create-sso"": ""Создать SSO"", + ""delete-sso"": ""Подтвердите удаление"", + ""confirm-delete"": ""Вы уверены, что хотите удалить конфигурацию SSO \""{{name}}\""?\n\nЭТО ДЕЙСТВИЕ НЕОБРАТИМО❗"", + ""client-secret"": ""Секрет клиента"", + ""identifier"": ""Идентификатор"", + ""scopes"": ""Области применения"", + ""template"": ""Шаблон"", + ""authorization-endpoint"": ""Конечная точка авторизации"", + ""token-endpoint"": ""Конечная точка токена"", + ""redirect-url"": ""URL-адрес перенаправления"", + ""client-id"": ""ID клиента"", + ""sso-list"": ""Список SSO"", + ""custom"": ""Собственный"", + ""sso-updated"": ""SSO {{name}} обновлена"", + ""display-name"": ""Отображаемое имя"", + ""identifier-filter"": ""Идентифиактор фильтра"", + ""user-endpoint"": ""Конечная точка пользователя"", + ""update-sso"": ""Обновить SSO"" + } }, - ""preference-section"": { - ""theme"": ""Тема"", - ""default-memo-visibility"": ""Видимость записей по умолчанию"", - ""default-resource-visibility"": ""Видимость ресурсов по умолчанию"", - ""enable-folding-memo"": ""Включить сворачивание записей"", - ""editor-font-style"": ""Стиль шрифта"", - ""mobile-editor-style"": ""Стиль мобильного редактора"", - ""default-memo-sort-option"": ""Отображаемое время записи"", - ""created_ts"": ""Время создания"", - ""updated_ts"": ""Время обновления"", - ""enable-double-click"": ""Разрешить двойной клик для редактирования"", - ""daily-review-time-offset"": ""Смещение времени ежедневного просмотра"", - ""auto-collapse"": ""Автоматическое свертывание"", - ""telegram-user-id"": ""ID пользователя Telegram"", - ""telegram-user-id-placeholder"": ""Отправьте любое сообщение своему Telegram-боту, чтобы узнать ID"" + ""amount-text"": { + ""memo_one"": ""ЗАПИСЬ"", + ""memo_few"": """", + ""memo_many"": """" }, - ""member-section"": { - ""create-a-member"": ""Создать"", - ""archive-member"": ""Деактивировать"", - ""archive-warning"": ""❗ Вы уверены, что хотите деактивировать пользователя {{username}}?"", - ""delete-member"": ""Удалить"", - ""delete-warning"": ""❗ Вы уверены, что хотите удалить пользователя {{username}}?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"" + ""message"": { + ""no-data"": ""Данные не были найдены."", + ""memos-ready"": ""больше записей нет 🎉"", + ""resource-ready"": ""больше ресурсов нет 🎉"", + ""restored-successfully"": ""Успешно восстановлено."", + ""memo-updated-datetime"": ""Время создания изменено."", + ""invalid-created-datetime"": ""Неверное время создания."", + ""change-memo-created-time"": ""Изменить время создания записи"", + ""memo-not-found"": ""Запись не найдена."", + ""fill-all"": ""Пожалуйста, заполните все поля."", + ""password-not-match"": ""Пароли не совпадают."", + ""new-password-not-match"": ""Новый пароль не совпадает."", + ""image-load-failed"": ""Ошибка загрузки изображения"", + ""fill-form"": ""Пожалуйста, заполните форму"", + ""login-failed"": ""Ошибка входа"", + ""signup-failed"": ""Ошибка регистрации"", + ""user-not-found"": ""Пользователь не найден"", + ""password-changed"": ""Пароль изменён"", + ""private-only"": ""Это частная заметка."", + ""copied"": ""Скопировано"", + ""succeed-copy-content"": ""Скопировано в буфер обмена."", + ""succeed-copy-link"": ""Ссылка скопирована в буфер обмена."", + ""change-resource-filename"": ""Изменить имя файла"", + ""resource-filename-updated"": ""Имя файла изменено."", + ""invalid-resource-filename"": ""Неверное имя файла."", + ""click-to-save-the-image"": ""Нажмите для сохранения изображения"", + ""generating-the-screenshot"": ""Создание снимка..."", + ""count-selected-resources"": ""Всего выбрано"", + ""succeed-vacuum-database"": ""База данных успешно сжата"", + ""succeed-update-additional-style"": ""Настраиваемый стиль успешно обновлен"", + ""succeed-copy-resource-link"": ""Ссылка на файл скопирована в буфер обмена"", + ""succeed-update-customized-profile"": ""Собственный профиль успешно обновлён"", + ""succeed-update-additional-script"": ""Настраиваемый скрипт успешно обновлён"", + ""update-succeed"": ""Успешно обновлено"", + ""succeed-copy-code"": ""Код успешно скопирован."", + ""page-not-found"": ""404 - Страница не найдена 😥"", + ""change-memo-created-time-warning-1"": ""ЭТО НЕНОРМАЛЬНОЕ ПОВЕДЕНИЕ."", + ""change-memo-created-time-warning-2"": ""Пожалуйста, убедитесь, что вам это действительно нужно."", + ""fill-server-name"": ""Пожалуйста, введите имя сервера"", + ""maximum-upload-size-is"": ""Максимальный размер для загрузки {{size}} МБ"", + ""file-exceeds-upload-limit-of"": ""Файл {{file}} превышает лимит на загрузку {{size}} МБ"" }, - ""system-section"": { - ""server-name"": ""Имя сервера"", - ""customize-server"": { - ""title"": ""Настроить сервер"", - ""default"": ""По умолчанию: memos"", - ""icon-url"": ""URL иконки"", - ""description"": ""Описание"", - ""locale"": ""Язык"", - ""appearance"": ""Тема"" - }, - ""database-file-size"": ""Размер файла базы данных"", - ""allow-user-signup"": ""Разрешить регистрацию пользователей"", - ""additional-style"": ""Настраиваемый стиль"", - ""additional-script"": ""Настраиваемый скрипт"", - ""additional-style-placeholder"": ""Настраиваемый код CSS"", - ""additional-script-placeholder"": ""Настраиваемый код JavaScript"", - ""disable-public-memos"": ""Отключить публичные записи"", - ""ignore-version-upgrade"": ""Игнорировать версию"", - ""max-upload-size"": ""Максимальный размер загрузки (МБ)"", - ""max-upload-size-hint"": ""Рекомендуемое значение 32 MБ."", - ""telegram-bot-token"": ""Токен Telegram бота"", - ""telegram-bot-token-description"": ""Токен Telegram бота или прокси API вида `http.../bot`"", - ""telegram-bot-token-placeholder"": ""Ваш токен Telegram бота"", - ""openai-api-key-placeholder"": ""Ваш ключ API OpenAI"", - ""openai-api-key-description"": ""Получить ключ API"", - ""openai-api-host-placeholder"": ""По умолчанию: https://api.openai.com/"", - ""openai-api-key"": ""OpenAI: ключ API"", - ""openai-api-host"": ""OpenAI: Хост API"", - ""display-with-updated-time"": ""Отображать время обновления записи"" + ""days"": { + ""mon"": ""Пон."", + ""tue"": ""Вт."", + ""wed"": ""Ср."", + ""thu"": ""Чт."", + ""fri"": ""Пт."", + ""sat"": ""Сб."", + ""sun"": ""Вс."" }, - ""appearance-option"": { - ""system"": ""Системная"", - ""light"": ""Светлая"", - ""dark"": ""Тёмная"" + ""embed-memo"": { + ""title"": ""Встраивание записи"", + ""text"": ""Скопируйте и вставьте код в Ваш блог или сайт"", + ""only-public-supported"": ""* Поддерживаются только публичные записи"", + ""copy"": ""Скопировать"" }, - ""storage"": ""Хранилище"", - ""sso"": ""SSO"", - ""storage-section"": { - ""storage-services-list"": ""Список хранилищ"", - ""create-a-service"": ""Создать сервис"", - ""update-a-service"": ""Обновить сервис"", - ""warning-text"": ""Вы уверены, что хотите удалить это хранилище?\nЭТО ДЕЙСТВИЕ НЕВОЗМОЖНО ОТМЕНИТЬ❗"", - ""delete-storage"": ""Удалить Хранилище"", - ""current-storage"": ""Текущее объектное хранилище"", - ""type-database"": ""База данных"", - ""type-local"": ""Локальное хранилище"", - ""local-storage-path"": ""Путь к локальному хранилищу"", - ""update-local-path"": ""Обновить путь к локальному хранилищу"", - ""update-local-path-description"": ""Путь к локальному хранилищу - это относительный путь к файлу вашей базы данных"", - ""create-storage"": ""Создать хранилище"", - ""update-storage"": ""Обновить хранилище"", - ""s3-compatible-url"": ""S3 совместимый URL"", - ""region"": ""Регион"", - ""region-placeholder"": ""Название региона"", - ""path"": ""Путь к хранилищу"", - ""path-description"": ""Вы можете использовать переменные от локального хранилища, например {filename}"", - ""url-prefix"": ""Префикс URL"", - ""bucket"": ""Корзина"", - ""accesskey-placeholder"": ""Ключ доступа / идентификатор доступа"", - ""accesskey"": ""Ключ доступа"", - ""secretkey"": ""Секретный ключ"", - ""url-suffix"": ""суффикс URL"", - ""secretkey-placeholder"": ""Секретный ключ / ключ доступа"", - ""bucket-placeholder"": ""Название корзины"", - ""endpoint"": ""Конечная точка"", - ""url-prefix-placeholder"": ""Пользовательский префикс URL, необязательно"", - ""path-placeholder"": ""пользовательский/путь"", - ""url-suffix-placeholder"": ""Пользовательский суффикс URL, необязательно"" + ""heatmap"": { + ""memo-in"": ""запись за {{period}}"", + ""memos-in"": ""записей за {{period}}"", + ""memo-on"": ""{{amount}} запись за {{date}}"", + ""memos-on"": ""{{amount}} записей за {{date}}"", + ""day"": ""день"", + ""days"": ""дней"" }, - ""sso-section"": { - ""sso-created"": ""SSO {{name}} создана"", - ""create-sso"": ""Создать SSO"", - ""delete-sso"": ""Подтвердите удаление"", - ""confirm-delete"": ""Вы уверены, что хотите удалить конфигурацию SSO \""{{name}}\""?\n\nЭТО ДЕЙСТВИЕ НЕОБРАТИМО❗"", - ""client-secret"": ""Секрет клиента"", - ""identifier"": ""Идентификатор"", - ""scopes"": ""Области применения"", - ""template"": ""Шаблон"", - ""authorization-endpoint"": ""Конечная точка авторизации"", - ""token-endpoint"": ""Конечная точка токена"", - ""redirect-url"": ""URL-адрес перенаправления"", - ""client-id"": ""ID клиента"", - ""sso-list"": ""Список SSO"", - ""custom"": ""Собственный"", - ""sso-updated"": ""SSO {{name}} обновлена"", - ""display-name"": ""Отображаемое имя"", - ""identifier-filter"": ""Идентифиактор фильтра"", - ""user-endpoint"": ""Конечная точка пользователя"", - ""update-sso"": ""Обновить SSO"" + ""about"": { + ""about-memos"": ""О Memos"", + ""memos-description"": ""Memos - это веб-приложение для создания заметок, которое вы можете использовать для написания, упорядочивания заметок и обмена ими."", + ""no-server-description"": ""Описание для этого сервера не настроено."", + ""other-projects"": ""Другие проекты"", + ""powered-by"": ""Создано"" } - }, - ""amount-text"": { - ""memo_one"": ""ЗАПИСЬ"", - ""tag_one"": ""ТЕГ"", - ""day_one"": ""ДЕНЬ"", - ""memo_other"": ""ЗАПИСИ"", - ""tag_other"": ""ТЕГИ"", - ""day_other"": ""ДНИ"" - }, - ""message"": { - ""no-data"": ""Данные не были найдены."", - ""no-memos"": ""нет записей 🌃"", - ""memos-ready"": ""больше записей нет 🎉"", - ""resource-ready"": ""больше ресурсов нет 🎉"", - ""restored-successfully"": ""Успешно восстановлено."", - ""memo-updated-datetime"": ""Время создания изменено."", - ""invalid-created-datetime"": ""Неверное время создания."", - ""change-memo-created-time"": ""Изменить время создания записи"", - ""memo-not-found"": ""Запись не найдена."", - ""fill-all"": ""Пожалуйста, заполните все поля."", - ""password-not-match"": ""Пароли не совпадают."", - ""new-password-not-match"": ""Новый пароль не совпадает."", - ""image-load-failed"": ""Ошибка загрузки изображения"", - ""fill-form"": ""Пожалуйста, заполните форму"", - ""login-failed"": ""Ошибка входа"", - ""signup-failed"": ""Ошибка регистрации"", - ""user-not-found"": ""Пользователь не найден"", - ""password-changed"": ""Пароль изменён"", - ""private-only"": ""Это частная заметка."", - ""copied"": ""Скопировано"", - ""succeed-copy-content"": ""Скопировано в буфер обмена."", - ""succeed-copy-link"": ""Ссылка скопирована в буфер обмена."", - ""change-resource-filename"": ""Изменить имя файла"", - ""resource-filename-updated"": ""Имя файла изменено."", - ""invalid-resource-filename"": ""Неверное имя файла."", - ""click-to-save-the-image"": ""Нажмите для сохранения изображения"", - ""generating-the-screenshot"": ""Создание снимка..."", - ""count-selected-resources"": ""Всего выбрано"", - ""too-short"": ""Слишком короткое"", - ""too-long"": ""Слишком длинное"", - ""not-allow-space"": ""Пробел не разрешён"", - ""not-allow-chinese"": ""Китайские символы не разрешены"", - ""succeed-vacuum-database"": ""База данных успешно сжата"", - ""succeed-update-additional-style"": ""Настраиваемый стиль успешно обновлен"", - ""succeed-copy-resource-link"": ""Ссылка на файл скопирована в буфер обмена"", - ""succeed-update-customized-profile"": ""Собственный профиль успешно обновлён"", - ""succeed-update-additional-script"": ""Настраиваемый скрипт успешно обновлён"", - ""update-succeed"": ""Успешно обновлено"", - ""succeed-copy-code"": ""Код успешно скопирован."", - ""page-not-found"": ""404 - Страница не найдена 😥"", - ""change-memo-created-time-warning-1"": ""ЭТО НЕНОРМАЛЬНОЕ ПОВЕДЕНИЕ."", - ""change-memo-created-time-warning-2"": ""Пожалуйста, убедитесь, что вам это действительно нужно."", - ""fill-server-name"": ""Пожалуйста, введите имя сервера"", - ""maximum-upload-size-is"": ""Максимальный размер для загрузки {{size}} МБ"", - ""file-exceeds-upload-limit-of"": ""Файл {{file}} превышает лимит на загрузку {{size}} МБ"" - }, - ""days"": { - ""monday"": ""Понедельник"", - ""mon"": ""Пон."", - ""tuesday"": ""Вторник"", - ""tue"": ""Вт."", - ""wednesday"": ""Среда"", - ""wed"": ""Ср."", - ""thursday"": ""Четверг"", - ""thu"": ""Чт."", - ""friday"": ""Пятница"", - ""fri"": ""Пт."", - ""saturday"": ""Суббота"", - ""sat"": ""Сб."", - ""sunday"": ""Воскресенье"", - ""sun"": ""Вс."" - }, - ""ask-ai"": { - ""title"": ""Спросить ИИ"", - ""not-enabled"": ""Вам нужно установить ключ OpenAI API."", - ""go-to-settings"": ""Перейти в настройки"", - ""placeholder"": ""Спросите что угодно…"", - ""default-message-group-title"": ""Сессия по умолчанию"", - ""create-message-group-title"": ""Создать сессию"", - ""label-message-group-name-title"": ""Название сессии"" - }, - ""embed-memo"": { - ""title"": ""Встраивание записи"", - ""text"": ""Скопируйте и вставьте код в Ваш блог или сайт"", - ""only-public-supported"": ""* Поддерживаются только публичные записи"", - ""copy"": ""Скопировать"" - }, - ""visibility"": { - ""PUBLIC"": ""ПУБЛИЧНОЕ"", - ""PROTECTED"": ""ЗАЩИЩЁННОЕ"", - ""PRIVATE"": ""ЛИЧНОЕ"" - }, - ""heatmap"": { - ""memo-in"": ""запись за {{period}}"", - ""memos-in"": ""записей за {{period}}"", - ""memo-on"": ""{{amount}} запись за {{date}}"", - ""memos-on"": ""{{amount}} записей за {{date}}"", - ""day"": ""день"", - ""days"": ""дней"" - }, - ""about"": { - ""about-memos"": ""О Memos"", - ""memos-description"": ""Memos - это веб-приложение для создания заметок, которое вы можете использовать для написания, упорядочивания заметок и обмена ими."", - ""no-server-description"": ""Описание для этого сервера не настроено."", - ""other-projects"": ""Другие проекты"", - ""powered-by"": ""Создано"" - } } diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json index e51f6df7df4eb..84c237b659562 100644 --- a/web/src/locales/sl.json +++ b/web/src/locales/sl.json @@ -1,308 +1,228 @@ { - ""common"": { - ""about"": ""O programu"", - ""home"": ""Domov"", - ""resources"": ""Viri"", - ""settings"": ""Nastavitve"", - ""daily-review"": ""Dnevno"", - ""ask-ai"": ""Vprašaj AI"", - ""archived"": ""Arhivirani"", - ""email"": ""Email"", - ""password"": ""Geslo"", - ""avatar"": ""Avatar"", - ""username"": ""Uporabnik"", - ""nickname"": ""Nadimek"", - ""new-password"": ""Novo geslo"", - ""repeat-new-password"": ""Ponovi novo geslo"", - ""save"": ""Shrani"", - ""close"": ""Zapri"", - ""cancel"": ""Prekliči"", - ""create"": ""Dodaj"", - ""change"": ""Spremeni"", - ""confirm"": ""Potrdi"", - ""reset"": ""Ponastavi"", - ""language"": ""Jezik"", - ""version"": ""Verzija"", - ""pin"": ""Pripni"", - ""unpin"": ""Odpni"", - ""edit"": ""Uredi"", - ""restore"": ""Privzeto"", - ""delete"": ""Izbriši"", - ""null"": ""Nič"", - ""share"": ""Deli"", - ""archive"": ""Arhiv"", - ""basic"": ""Osnovni"", - ""admin"": ""Admin"", - ""explore"": ""Razišči"", - ""sign-in"": ""Prijavi se"", - ""sign-up"": ""Registriraj"", - ""sign-out"": ""Odjavi se"", - ""back-to-home"": ""Nazaj domov"", - ""type"": ""Tip"", - ""title"": ""Naslov"", - ""filter"": ""Filter"", - ""tags"": ""Značke"", - ""yourself"": ""Ti"", - ""archived-at"": ""Arhiviran ob"", - ""changed"": ""spremenjen"", - ""update-on"": ""Posodobljen ob"", - ""fold"": ""Zloži"", - ""expand"": ""Razširi"", - ""image"": ""Slika"", - ""link"": ""Povezava"", - ""vacuum"": ""Skrči"", - ""select"": ""Izberi"", - ""database"": ""Baza"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Prijavite se kot gostitelj"", - ""host-tip"": ""Registrirani ste kot gostitelj strani."", - ""not-host-tip"": ""Če nimate računa, prosim kontaktirajte gostitelja strani."" - }, - ""resource"": { - ""description"": ""Poglejte svoje statične vire v beležkah npr. slike"", - ""no-resources"": ""Ni virov."", - ""fetching-data"": ""pridobivam podatke..."", - ""upload"": ""Naloži"", - ""preview"": ""Predogled"", - ""copy-link"": ""Kopiraj povezavo"", - ""delete-resource"": ""Izbriši vir"", - ""warning-text"": ""Ali ste prepričani, da želite izbrisati ta vir? TA AKCIJA JE NEPOVRATNA❗"", - ""linked-amount"": ""Povezana količina beležk"", - ""rename"": ""Preimenuj"", - ""clear"": ""Počisti"", - ""warning-text-unused"": ""Ali ste prepričani, da želite izbrisati neuporabljene vire? TA AKCIJA JE NEPOVRATNA❗"", - ""no-unused-resources"": ""Ni neuporabljenih virov"", - ""name"": ""Naziv"", - ""delete-selected-resources"": ""Izbrišite izbrane vire"", - ""no-files-selected"": ""Nobena datoteka ni označena❗"", - ""upload-successfully"": ""Nalaganje uspešno"", - ""file-drag-drop-prompt"": ""Za nalaganje, tu povlecite in spustite vaše datoteke"", - ""select"": ""Izberite"", - ""search-bar-placeholder"": ""Iskanje virov"", - ""create-dialog"": { - ""title"": ""Dodaj vir"", - ""upload-method"": ""Metoda nalaganja"", - ""local-file"": { - ""option"": ""Lokalna datoteka"", - ""choose"": ""Izberite datoteko..."" - }, - ""external-link"": { - ""option"": ""Zunanja povezava"", - ""link"": ""Povezava"", - ""file-name"": ""Ime datoteke"", - ""file-name-placeholder"": ""Ime datoteke"", + ""common"": { + ""about"": ""O programu"", + ""home"": ""Domov"", + ""resources"": ""Viri"", + ""settings"": ""Nastavitve"", + ""archived"": ""Arhivirani"", + ""email"": ""Email"", + ""password"": ""Geslo"", + ""avatar"": ""Avatar"", + ""username"": ""Uporabnik"", + ""nickname"": ""Nadimek"", + ""save"": ""Shrani"", + ""close"": ""Zapri"", + ""cancel"": ""Prekliči"", + ""create"": ""Dodaj"", + ""change"": ""Spremeni"", + ""confirm"": ""Potrdi"", + ""reset"": ""Ponastavi"", + ""language"": ""Jezik"", + ""version"": ""Verzija"", + ""pin"": ""Pripni"", + ""unpin"": ""Odpni"", + ""edit"": ""Uredi"", + ""restore"": ""Privzeto"", + ""delete"": ""Izbriši"", + ""null"": ""Nič"", + ""share"": ""Deli"", + ""archive"": ""Arhiv"", + ""basic"": ""Osnovni"", + ""admin"": ""Admin"", + ""explore"": ""Razišči"", + ""sign-in"": ""Prijavi se"", + ""sign-up"": ""Registriraj"", + ""sign-out"": ""Odjavi se"", ""type"": ""Tip"", - ""type-placeholder"": ""Tip datoteke"" - } - } - }, - ""archived"": { - ""archived-memos"": ""Arhivirane beležke"", - ""no-archived-memos"": ""Ni arhiviranih beležk."", - ""fetching-data"": ""pridobivam podatke..."" - }, - ""editor"": { - ""editing"": ""Urejanje..."", - ""cancel-edit"": ""Prekliči urejanje"", - ""save"": ""Shrani"", - ""placeholder"": ""Kakšne misli..."", - ""only-image-supported"": ""Podprta je samo slikovna datoteka."", - ""cant-empty"": ""Vsebina ne more biti prazna"", - ""local"": ""Lokalno"", - ""resources"": ""Viri"" - }, - ""memo"": { - ""view-detail"": ""Poglej podrobnosti"", - ""copy"": ""Kopiraj"", - ""copy-link"": ""Kopiraj povezavo"", - ""embed"": ""Vdelaj beležko"", - ""visibility"": { - ""private"": ""Vidno samo za vas"", - ""protected"": ""Vidno uporabnikom"", - ""public"": ""Vidno vsem"", - ""disabled"": ""Javne beležke so onemogočene"" - } - }, - ""memo-list"": { - ""fetching-data"": ""pridobivam podatke..."", - ""fetch-more"": ""Kliknite tu da pridobite še več"" - }, - ""filter"": { - ""new-filter"": ""Nov filter"", - ""type"": { - ""tag"": ""Značka"", - ""type"": ""Tip"", - ""text"": ""Tekst"", - ""display-time"": ""Prikazan čas"", - ""visibility"": ""Vidnost"" + ""title"": ""Naslov"", + ""filter"": ""Filter"", + ""tags"": ""Značke"", + ""yourself"": ""Ti"", + ""changed"": ""spremenjen"", + ""fold"": ""Zloži"", + ""expand"": ""Razširi"", + ""image"": ""Slika"", + ""link"": ""Povezava"", + ""vacuum"": ""Skrči"", + ""select"": ""Izberi"", + ""database"": ""Baza"", + ""mark"": ""Mark"" + }, + ""auth"": { + ""host-tip"": ""Registrirani ste kot gostitelj strani."" + }, + ""resource"": { + ""no-resources"": ""Ni virov."", + ""fetching-data"": ""pridobivam podatke..."", + ""copy-link"": ""Kopiraj povezavo"", + ""delete-resource"": ""Izbriši vir"", + ""warning-text"": ""Ali ste prepričani, da želite izbrisati ta vir? TA AKCIJA JE NEPOVRATNA❗"", + ""linked-amount"": ""Povezana količina beležk"", + ""clear"": ""Počisti"", + ""warning-text-unused"": ""Ali ste prepričani, da želite izbrisati neuporabljene vire? TA AKCIJA JE NEPOVRATNA❗"", + ""no-unused-resources"": ""Ni neuporabljenih virov"", + ""delete-selected-resources"": ""Izbrišite izbrane vire"", + ""no-files-selected"": ""Nobena datoteka ni označena❗"", + ""upload-successfully"": ""Nalaganje uspešno"", + ""file-drag-drop-prompt"": ""Za nalaganje, tu povlecite in spustite vaše datoteke"", + ""search-bar-placeholder"": ""Iskanje virov"", + ""create-dialog"": { + ""title"": ""Dodaj vir"", + ""upload-method"": ""Metoda nalaganja"", + ""local-file"": { + ""option"": ""Lokalna datoteka"", + ""choose"": ""Izberite datoteko..."" + }, + ""external-link"": { + ""option"": ""Zunanja povezava"", + ""link"": ""Povezava"", + ""file-name"": ""Ime datoteke"", + ""file-name-placeholder"": ""Ime datoteke"", + ""type"": ""Tip"", + ""type-placeholder"": ""Tip datoteke"" + } + } }, - ""operator"": { - ""contains"": ""Vsebuje"", - ""not-contains"": ""Ne vsebuje"", - ""is"": ""Je"", - ""is-not"": ""Ni"", - ""before"": ""Pred"", - ""after"": ""Po"" + ""editor"": { + ""editing"": ""Urejanje..."", + ""cancel-edit"": ""Prekliči urejanje"", + ""save"": ""Shrani"", + ""placeholder"": ""Kakšne misli..."", + ""only-image-supported"": ""Podprta je samo slikovna datoteka."", + ""cant-empty"": ""Vsebina ne more biti prazna"", + ""local"": ""Lokalno"", + ""resources"": ""Viri"" }, - ""value"": { - ""not-tagged"": ""Ni značk"", - ""linked"": ""Ima povezavo"", - ""has-attachment"": ""Ima priponke"" + ""memo"": { + ""view-detail"": ""Poglej podrobnosti"", + ""copy-link"": ""Kopiraj povezavo"", + ""embed"": ""Vdelaj beležko"", + ""visibility"": { + ""private"": ""Vidno samo za vas"", + ""protected"": ""Vidno uporabnikom"", + ""public"": ""Vidno vsem"", + ""disabled"": ""Javne beležke so onemogočene"" + } }, - ""text-placeholder"": ""Začnite s ^ za uporabo regex"" - }, - ""tag-list"": { - ""tip-text"": ""Vnesite `#značka` za izdalavo"", - ""create-tag"": ""Kreiraj značko"", - ""all-tags"": ""Vse značke"", - ""tag-name"": ""IME_ZNAČKE"" - }, - ""search"": { - ""quickly-filter"": ""Hitro filtriraj"" - }, - ""search-bar"": { - ""input-placeholder"": ""Iskanje beležk"" - }, - ""setting"": { - ""my-account"": ""Moj račun"", - ""preference"": ""Nastavitve"", - ""member"": ""Uporabnik"", - ""member-list"": ""Seznam uporabnikov"", - ""system"": ""Sistem"", - ""storage"": ""Shramba"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""Podatki o računu"", - ""update-information"": ""Posodobi informacije"", - ""change-password"": ""Zamenjaj geslo"" + ""tag-list"": { + ""tip-text"": ""Vnesite `#značka` za izdalavo"", + ""create-tag"": ""Kreiraj značko"", + ""all-tags"": ""Vse značke"", + ""tag-name"": ""IME_ZNAČKE"" }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Privzeta vidnost beležke"", - ""default-resource-visibility"": ""Privzeta vidnost vira"", - ""enable-folding-memo"": ""Omogoči zložljivo beležko"", - ""enable-double-click"": ""Omogoči dvojni klik za urejanje"", - ""editor-font-style"": ""Tip pisave urejevalnika"", - ""mobile-editor-style"": ""Stil mobilnega urejevalnika"", - ""default-memo-sort-option"": ""Čas prikaza beležke"", - ""created_ts"": ""Čas ustvarjanja"", - ""updated_ts"": ""Čas posodobitve"", - ""daily-review-time-offset"": ""Časovni odmik dnevnega pregleda"", - ""auto-collapse"": ""Samodejno strni"" + ""setting"": { + ""my-account"": ""Moj račun"", + ""preference"": ""Nastavitve"", + ""member"": ""Uporabnik"", + ""member-list"": ""Seznam uporabnikov"", + ""system"": ""Sistem"", + ""storage"": ""Shramba"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""Podatki o računu"", + ""update-information"": ""Posodobi informacije"", + ""change-password"": ""Zamenjaj geslo"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Privzeta vidnost beležke"", + ""default-resource-visibility"": ""Privzeta vidnost vira"", + ""enable-folding-memo"": ""Omogoči zložljivo beležko"", + ""enable-double-click"": ""Omogoči dvojni klik za urejanje"", + ""editor-font-style"": ""Tip pisave urejevalnika"", + ""mobile-editor-style"": ""Stil mobilnega urejevalnika"", + ""default-memo-sort-option"": ""Čas prikaza beležke"", + ""created_ts"": ""Čas ustvarjanja"", + ""updated_ts"": ""Čas posodobitve"", + ""daily-review-time-offset"": ""Časovni odmik dnevnega pregleda"", + ""auto-collapse"": ""Samodejno strni"" + }, + ""storage-section"": { + ""storage-services-list"": ""Seznam storitev shramb"", + ""create-a-service"": ""Kreiraj storitev"", + ""update-a-service"": ""Posodobi storitev"", + ""warning-text"": ""Ali ste prepričani, da želite izbrisati storitev shrambe? TA AKCIJA JE NEPOVRATNA❗"", + ""delete-storage"": ""Izbriši shrambo"" + }, + ""member-section"": { + ""create-a-member"": ""Dodaj novega uporabnika"" + }, + ""system-section"": { + ""server-name"": ""Ime strežnika"", + ""customize-server"": { + ""title"": ""Prilagodi strežnik"", + ""default"": ""Privzeto je memos"", + ""icon-url"": ""URL ikone"" + }, + ""database-file-size"": ""Velikost podatkovne baze"", + ""allow-user-signup"": ""Omogočite kreiranje novih uporabnikov"", + ""disable-public-memos"": ""Onemogočite javne beležke"", + ""additional-style"": ""Dodatni stili"", + ""additional-script"": ""Dodatne skripte"", + ""additional-style-placeholder"": ""Dodatna CSS koda"", + ""additional-script-placeholder"": ""Dodatna JavaScript koda"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Sledi sistemu"", + ""light"": ""Vedno svetla"", + ""dark"": ""Vedno temna"" + } }, - ""storage-section"": { - ""storage-services-list"": ""Seznam storitev shramb"", - ""create-a-service"": ""Kreiraj storitev"", - ""update-a-service"": ""Posodobi storitev"", - ""warning-text"": ""Ali ste prepričani, da želite izbrisati storitev shrambe? TA AKCIJA JE NEPOVRATNA❗"", - ""delete-storage"": ""Izbriši shrambo"" + ""amount-text"": { + ""memo_one"": ""BELEŽKA"", + ""memo_two"": """", + ""memo_few"": """", + ""memo_other"": ""BELEŽKE"" }, - ""member-section"": { - ""create-a-member"": ""Dodaj novega uporabnika"" + ""message"": { + ""memos-ready"": ""vse beležke so pripravljene 🎉"", + ""restored-successfully"": ""Uspešno obnovljeno"", + ""memo-updated-datetime"": ""Spremenjen čas ustvarjene beležke."", + ""invalid-created-datetime"": ""Neveljavno ustvarjen čas."", + ""change-memo-created-time"": ""Spremeni čas izdelave beležke"", + ""memo-not-found"": ""Ne najdem beležke."", + ""fill-all"": ""Prosim izpolnite vsa polja."", + ""password-not-match"": ""Gesli se ne ujemata."", + ""new-password-not-match"": ""Novi gesli se ne ujemata."", + ""image-load-failed"": ""Napaka pri nalaganju slike"", + ""fill-form"": ""Prosim izpolnite ta obrazec"", + ""login-failed"": ""Napaka pri prijavi"", + ""signup-failed"": ""Napaka pri registraciji"", + ""user-not-found"": ""Ne najdem uporabnika"", + ""password-changed"": ""Geslo je spremenjeno"", + ""private-only"": ""Ta beležka je zasebna."", + ""copied"": ""Skopirano"", + ""succeed-copy-content"": ""Vsebina je uspešno skopirana."", + ""succeed-copy-code"": ""Koda je uspešno skopirana."", + ""succeed-copy-link"": ""Povezava je uspešno skopirana."", + ""change-resource-filename"": ""Spremenite ime vira"", + ""resource-filename-updated"": ""Ime vira je spremenjeno."", + ""invalid-resource-filename"": ""Neveljavno ime datoteke."", + ""click-to-save-the-image"": ""Kliknite za shranjevanje slike"", + ""generating-the-screenshot"": ""Generiram zajem zaslona..."", + ""count-selected-resources"": ""Skupaj izbrano"", + ""succeed-vacuum-database"": ""Baza je uspešno skrčena"", + ""succeed-update-additional-style"": ""Dodatni stili so uspešno posodobljeni."", + ""succeed-copy-resource-link"": ""Povezava do vira je uspešno skopirana."", + ""succeed-update-customized-profile"": ""Profil je uspešno prilagojen."", + ""succeed-update-additional-script"": ""Dodatne skripte so uspešno posodobljene."", + ""update-succeed"": ""Posodobitev je uspešna"", + ""page-not-found"": ""404 - Ne najdem strani 😥"" }, - ""system-section"": { - ""server-name"": ""Ime strežnika"", - ""customize-server"": { - ""title"": ""Prilagodi strežnik"", - ""default"": ""Privzeto je memos"", - ""icon-url"": ""URL ikone"" - }, - ""database-file-size"": ""Velikost podatkovne baze"", - ""allow-user-signup"": ""Omogočite kreiranje novih uporabnikov"", - ""disable-public-memos"": ""Onemogočite javne beležke"", - ""additional-style"": ""Dodatni stili"", - ""additional-script"": ""Dodatne skripte"", - ""additional-style-placeholder"": ""Dodatna CSS koda"", - ""additional-script-placeholder"": ""Dodatna JavaScript koda"", - ""display-with-updated-time"": ""Display with updated time"" + ""days"": { + ""mon"": ""Pon"", + ""tue"": ""Tor"", + ""wed"": ""Sre"", + ""thu"": ""Čet"", + ""fri"": ""Pet"", + ""sat"": ""Sob"", + ""sun"": ""Ned"" }, - ""appearance-option"": { - ""system"": ""Sledi sistemu"", - ""light"": ""Vedno svetla"", - ""dark"": ""Vedno temna"" + ""embed-memo"": { + ""title"": ""Vdelaj beležko"", + ""text"": ""Kopirajte in prilepite spodnjo kodo v vaš blog ali spletno stran."", + ""only-public-supported"": ""* Podprte so samo javne beležke."", + ""copy"": ""Kopiraj"" } - }, - ""amount-text"": { - ""memo_one"": ""BELEŽKA"", - ""memo_other"": ""BELEŽKE"", - ""tag_one"": ""ZNAČKA"", - ""tag_other"": ""ZNAČKE"", - ""day_one"": ""DAN"", - ""day_other"": ""DNI"" - }, - ""message"": { - ""no-memos"": ""ni beležk 🌃"", - ""memos-ready"": ""vse beležke so pripravljene 🎉"", - ""restored-successfully"": ""Uspešno obnovljeno"", - ""memo-updated-datetime"": ""Spremenjen čas ustvarjene beležke."", - ""invalid-created-datetime"": ""Neveljavno ustvarjen čas."", - ""change-memo-created-time"": ""Spremeni čas izdelave beležke"", - ""memo-not-found"": ""Ne najdem beležke."", - ""fill-all"": ""Prosim izpolnite vsa polja."", - ""password-not-match"": ""Gesli se ne ujemata."", - ""new-password-not-match"": ""Novi gesli se ne ujemata."", - ""image-load-failed"": ""Napaka pri nalaganju slike"", - ""fill-form"": ""Prosim izpolnite ta obrazec"", - ""login-failed"": ""Napaka pri prijavi"", - ""signup-failed"": ""Napaka pri registraciji"", - ""user-not-found"": ""Ne najdem uporabnika"", - ""password-changed"": ""Geslo je spremenjeno"", - ""private-only"": ""Ta beležka je zasebna."", - ""copied"": ""Skopirano"", - ""succeed-copy-content"": ""Vsebina je uspešno skopirana."", - ""succeed-copy-code"": ""Koda je uspešno skopirana."", - ""succeed-copy-link"": ""Povezava je uspešno skopirana."", - ""change-resource-filename"": ""Spremenite ime vira"", - ""resource-filename-updated"": ""Ime vira je spremenjeno."", - ""invalid-resource-filename"": ""Neveljavno ime datoteke."", - ""click-to-save-the-image"": ""Kliknite za shranjevanje slike"", - ""generating-the-screenshot"": ""Generiram zajem zaslona..."", - ""count-selected-resources"": ""Skupaj izbrano"", - ""too-short"": ""Prekratko"", - ""too-long"": ""Predolgo"", - ""not-allow-space"": ""Ne dovoli presledkov"", - ""not-allow-chinese"": ""Ne dovoli kitajščine"", - ""succeed-vacuum-database"": ""Baza je uspešno skrčena"", - ""succeed-update-additional-style"": ""Dodatni stili so uspešno posodobljeni."", - ""succeed-copy-resource-link"": ""Povezava do vira je uspešno skopirana."", - ""succeed-update-customized-profile"": ""Profil je uspešno prilagojen."", - ""succeed-update-additional-script"": ""Dodatne skripte so uspešno posodobljene."", - ""update-succeed"": ""Posodobitev je uspešna"", - ""page-not-found"": ""404 - Ne najdem strani 😥"" - }, - ""days"": { - ""monday"": ""Ponedeljek"", - ""mon"": ""Pon"", - ""tuesday"": ""Torek"", - ""tue"": ""Tor"", - ""wednesday"": ""Sreda"", - ""wed"": ""Sre"", - ""thursday"": ""Četrtek"", - ""thu"": ""Čet"", - ""friday"": ""Petek"", - ""fri"": ""Pet"", - ""saturday"": ""Sobota"", - ""sat"": ""Sob"", - ""sunday"": ""Nedelja"", - ""sun"": ""Ned"" - }, - ""ask-ai"": { - ""title"": ""Vprašaj AI"", - ""not-enabled"": ""Niste še nastavili vašega OpenAI API ključa."", - ""go-to-settings"": ""Pojdite na nastavitve"", - ""placeholder"": ""Vprašajte karkoli…"" - }, - ""embed-memo"": { - ""title"": ""Vdelaj beležko"", - ""text"": ""Kopirajte in prilepite spodnjo kodo v vaš blog ali spletno stran."", - ""only-public-supported"": ""* Podprte so samo javne beležke."", - ""copy"": ""Kopiraj"" - }, - ""visibility"": { - ""PUBLIC"": ""JAVNO"", - ""PROTECTED"": ""ZAŠČITENO"", - ""PRIVATE"": ""ZASEBNO"" - } } diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json index 7fd4ac51d59cb..079c263c0db28 100644 --- a/web/src/locales/sv.json +++ b/web/src/locales/sv.json @@ -1,261 +1,189 @@ { - ""common"": { - ""about"": ""Om"", - ""email"": ""E-post"", - ""password"": ""Lösenord"", - ""repeat-password-short"": ""Upprepa"", - ""repeat-password"": ""Uprepa lösenordet"", - ""new-password"": ""Nytt lösenord"", - ""repeat-new-password"": ""Upprepa det nya lösenordet"", - ""username"": ""Användarnamn"", - ""nickname"": ""Smeknamn"", - ""save"": ""Spara"", - ""close"": ""Stäng"", - ""cancel"": ""Avbryt"", - ""create"": ""Skapa"", - ""change"": ""Ändra"", - ""confirm"": ""Bekräfta"", - ""reset"": ""Återställ"", - ""language"": ""Språk"", - ""version"": ""Version"", - ""pin"": ""Fäst"", - ""unpin"": ""Ta bort fäst"", - ""edit"": ""Redigera"", - ""restore"": ""Återställ"", - ""delete"": ""Radera"", - ""null"": ""Null"", - ""share"": ""Dela"", - ""archive"": ""Arkivera"", - ""basic"": ""Grundläggande"", - ""admin"": ""Admin"", - ""explore"": ""Utforska"", - ""sign-in"": ""Logga in"", - ""sign-up"": ""Bli medlem"", - ""sign-out"": ""Logga ut"", - ""back-to-home"": ""Tillbaka hem"", - ""type"": ""Typ"", - ""title"": ""Titel"", - ""filter"": ""Filter"", - ""tags"": ""Taggar"", - ""yourself"": ""Själv"", - ""archived-at"": ""Arkiverad på"", - ""changed"": ""Ändrad"", - ""update-on"": ""Uppdatering på"", - ""fold"": ""Vik ihop"", - ""expand"": ""Expandera"", - ""image"": ""Bild"", - ""link"": ""Länk"", - ""vacuum"": ""Vacuum"", - ""select"": ""Select"", - ""avatar"": ""Avatar"", - ""database"": ""Databas"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Registera dig som värd"", - ""host-tip"": ""Du registerar dig som webbplatsvärd."", - ""not-host-tip"": ""Om du inte har ett konto, kontakta webbplatsens värd."" - }, - ""sidebar"": { - ""daily-review"": ""Daglig återblick"", - ""resources"": ""Resurser"", - ""setting"": ""Inställningar"", - ""archived"": ""Arkiverade"" - }, - ""resource"": { - ""description"": ""Visa dina statiska resurser i anteckningarn. t.ex bilder."", - ""no-resources"": ""Inga resurser."", - ""fetching-data"": ""hämtar data..."", - ""upload"": ""Ladda upp"", - ""preview"": ""Förhandsvisa"", - ""copy-link"": ""Kopiera länk"", - ""delete-resource"": ""Ta bort resurs"", - ""warning-text"": ""Är du säker på att du vill ta bort den här resursen? DENNA ÅTGÄRD ÄR OÅTERSTÄLLBAR❗"", - ""linked-amount"": ""Länkat antecknings belopp"", - ""rename"": ""Döp om"", - ""warning-text-unused"": ""Är du säker på att du vill ta bort denna oanvända resurs? DENNA ÅTGÄRD ÄR OÅTERSTÄLLBAR❗"", - ""no-unused-resources"": ""Inga oanvända resurser"", - ""name"": ""Name"", - ""clear"": ""Rensa"" - }, - ""archived"": { - ""archived-memos"": ""Arkiverade anteckningar"", - ""no-archived-memos"": ""Inga arkiverade anteckningar."", - ""fetching-data"": ""hämtar data..."" - }, - ""editor"": { - ""editing"": ""Redigerar..."", - ""cancel-edit"": ""Avbryt redigering"", - ""save"": ""Spara"", - ""placeholder"": ""Några tankar..."", - ""only-image-supported"": ""Endast bildfiler stöds."", - ""cant-empty"": ""Innehållet får inte vara tomt"", - ""local"": ""Lokal"", - ""resources"": ""Resurser"" - }, - ""memo"": { - ""view-detail"": ""Visa detaljer"", - ""copy"": ""Kopiera"", - ""copy-link"": ""Kopiera länk"", - ""visibility"": { - ""private"": ""Endast synlig för dig"", - ""protected"": ""Synlig för medlemmar"", - ""public"": ""Synlig för alla"", - ""disabled"": ""Offentliga anteckningar är inaktiverade"" - } - }, - ""memo-list"": { - ""fetching-data"": ""hämtar data..."", - ""fetch-more"": ""Klicka här för att hämta mer"" - }, - ""filter"": { - ""new-filter"": ""Nytt filter"", - ""type"": { - ""tag"": ""Tag"", - ""type"": ""Type"", - ""text"": ""Text"", - ""display-time"": ""Display Time"", - ""visibility"": ""Visibility"" + ""common"": { + ""about"": ""Om"", + ""email"": ""E-post"", + ""password"": ""Lösenord"", + ""username"": ""Användarnamn"", + ""nickname"": ""Smeknamn"", + ""save"": ""Spara"", + ""close"": ""Stäng"", + ""cancel"": ""Avbryt"", + ""create"": ""Skapa"", + ""change"": ""Ändra"", + ""confirm"": ""Bekräfta"", + ""reset"": ""Återställ"", + ""language"": ""Språk"", + ""version"": ""Version"", + ""pin"": ""Fäst"", + ""unpin"": ""Ta bort fäst"", + ""edit"": ""Redigera"", + ""restore"": ""Återställ"", + ""delete"": ""Radera"", + ""null"": ""Null"", + ""share"": ""Dela"", + ""archive"": ""Arkivera"", + ""basic"": ""Grundläggande"", + ""admin"": ""Admin"", + ""explore"": ""Utforska"", + ""sign-in"": ""Logga in"", + ""sign-up"": ""Bli medlem"", + ""sign-out"": ""Logga ut"", + ""type"": ""Typ"", + ""title"": ""Titel"", + ""filter"": ""Filter"", + ""tags"": ""Taggar"", + ""yourself"": ""Själv"", + ""changed"": ""Ändrad"", + ""fold"": ""Vik ihop"", + ""expand"": ""Expandera"", + ""image"": ""Bild"", + ""link"": ""Länk"", + ""vacuum"": ""Vacuum"", + ""select"": ""Select"", + ""avatar"": ""Avatar"", + ""database"": ""Databas"", + ""mark"": ""Mark"" }, - ""operator"": { - ""contains"": ""Innehåller"", - ""not-contains"": ""Innehåller inte"", - ""is"": ""Är"", - ""is-not"": ""Är inte"", - ""before"": ""Innan"", - ""after"": ""Efter"" + ""auth"": { + ""host-tip"": ""Du registerar dig som webbplatsvärd."" }, - ""value"": { - ""not-tagged"": ""Inga taggar"", - ""linked"": ""Har länkar"" + ""resource"": { + ""no-resources"": ""Inga resurser."", + ""fetching-data"": ""hämtar data..."", + ""copy-link"": ""Kopiera länk"", + ""delete-resource"": ""Ta bort resurs"", + ""warning-text"": ""Är du säker på att du vill ta bort den här resursen? DENNA ÅTGÄRD ÄR OÅTERSTÄLLBAR❗"", + ""linked-amount"": ""Länkat antecknings belopp"", + ""warning-text-unused"": ""Är du säker på att du vill ta bort denna oanvända resurs? DENNA ÅTGÄRD ÄR OÅTERSTÄLLBAR❗"", + ""no-unused-resources"": ""Inga oanvända resurser"", + ""clear"": ""Rensa"" }, - ""text-placeholder"": ""Börjar med ^ för att använda regex"" - }, - ""tag-list"": { - ""tip-text"": ""Ange `#tag ` för att skapa"" - }, - ""search"": { - ""quickly-filter"": ""Filtrera snabbt"" - }, - ""setting"": { - ""my-account"": ""Mitt konto"", - ""preference"": ""Preferenser"", - ""member"": ""Medlem"", - ""member-list"": ""Medlemslista"", - ""system"": ""System"", - ""account-section"": { - ""title"": ""Kontoinformation"", - ""update-information"": ""Uppdatera informationen"", - ""change-password"": ""Ändra lösenord"" + ""editor"": { + ""editing"": ""Redigerar..."", + ""cancel-edit"": ""Avbryt redigering"", + ""save"": ""Spara"", + ""placeholder"": ""Några tankar..."", + ""only-image-supported"": ""Endast bildfiler stöds."", + ""cant-empty"": ""Innehållet får inte vara tomt"", + ""local"": ""Lokal"", + ""resources"": ""Resurser"" }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Standard synlighet för anteckningar"", - ""enable-folding-memo"": ""Aktivera vikbara anteckningar"", - ""editor-font-style"": ""Redigerare teckensnitt"", - ""mobile-editor-style"": ""Mobilredigerade stil"", - ""default-memo-sort-option"": ""Anteckning visningstid"", - ""created_ts"": ""Skapade tid"", - ""updated_ts"": ""Upodaterad tid"", - ""enable-double-click"": ""Aktivera dubbelklick för att redigera"", - ""auto-collapse"": ""Autokollaps"" + ""memo"": { + ""view-detail"": ""Visa detaljer"", + ""copy-link"": ""Kopiera länk"", + ""visibility"": { + ""private"": ""Endast synlig för dig"", + ""protected"": ""Synlig för medlemmar"", + ""public"": ""Synlig för alla"", + ""disabled"": ""Offentliga anteckningar är inaktiverade"" + } }, - ""member-section"": { - ""create-a-member"": ""Skapa en medlem"" + ""tag-list"": { + ""tip-text"": ""Ange `#tag ` för att skapa"" }, - ""system-section"": { - ""server-name"": ""Server Name"", - ""customize-server"": { - ""title"": ""Customize Server"", - ""default"": ""Default is memos"", - ""icon-url"": ""Icon URL"" - }, - ""database-file-size"": ""Databas filstorlek"", - ""allow-user-signup"": ""Tillåt användarregistrering"", - ""additional-style"": ""Ytterligare stil"", - ""additional-script"": ""Ytterligare skript"", - ""additional-style-placeholder"": ""Ytterligare CSS kod"", - ""additional-script-placeholder"": ""Ytterligare JavaScript kod"", - ""disable-public-memos"": ""Inaktivera offentliga anteckningar"", - ""display-with-updated-time"": ""Display with updated time"" + ""setting"": { + ""my-account"": ""Mitt konto"", + ""preference"": ""Preferenser"", + ""member"": ""Medlem"", + ""member-list"": ""Medlemslista"", + ""system"": ""System"", + ""account-section"": { + ""title"": ""Kontoinformation"", + ""update-information"": ""Uppdatera informationen"", + ""change-password"": ""Ändra lösenord"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Standard synlighet för anteckningar"", + ""enable-folding-memo"": ""Aktivera vikbara anteckningar"", + ""editor-font-style"": ""Redigerare teckensnitt"", + ""mobile-editor-style"": ""Mobilredigerade stil"", + ""default-memo-sort-option"": ""Anteckning visningstid"", + ""created_ts"": ""Skapade tid"", + ""updated_ts"": ""Upodaterad tid"", + ""enable-double-click"": ""Aktivera dubbelklick för att redigera"", + ""auto-collapse"": ""Autokollaps"" + }, + ""member-section"": { + ""create-a-member"": ""Skapa en medlem"" + }, + ""system-section"": { + ""server-name"": ""Server Name"", + ""customize-server"": { + ""title"": ""Customize Server"", + ""default"": ""Default is memos"", + ""icon-url"": ""Icon URL"" + }, + ""database-file-size"": ""Databas filstorlek"", + ""allow-user-signup"": ""Tillåt användarregistrering"", + ""additional-style"": ""Ytterligare stil"", + ""additional-script"": ""Ytterligare skript"", + ""additional-style-placeholder"": ""Ytterligare CSS kod"", + ""additional-script-placeholder"": ""Ytterligare JavaScript kod"", + ""disable-public-memos"": ""Inaktivera offentliga anteckningar"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Follow system"", + ""light"": ""Alltid ljus"", + ""dark"": ""Alltid mörk"" + }, + ""storage-section"": { + ""create-a-service"": ""Skapa en tjänst"", + ""storage-services-list"": ""Lista över lagringstjänster"", + ""update-a-service"": ""Uppdatera en tjänst"", + ""warning-text"": ""Är du säker på att ta bort den här lagringstjänsten? DEN HÄR ÅTGÄRDEN ÄR IRREVERSIBEL❗"", + ""delete-storage"": ""Ta bort lagring"" + }, + ""storage"": ""Lagring"", + ""sso"": ""SSO"" }, - ""appearance-option"": { - ""system"": ""Follow system"", - ""light"": ""Alltid ljus"", - ""dark"": ""Alltid mörk"" + ""amount-text"": { + ""memo_one"": ""ANTECKNING"", + ""memo_other"": ""ANTECKNINGAR"" }, - ""storage-section"": { - ""create-a-service"": ""Skapa en tjänst"", - ""storage-services-list"": ""Lista över lagringstjänster"", - ""update-a-service"": ""Uppdatera en tjänst"", - ""warning-text"": ""Är du säker på att ta bort den här lagringstjänsten? DEN HÄR ÅTGÄRDEN ÄR IRREVERSIBEL❗"", - ""delete-storage"": ""Ta bort lagring"" + ""message"": { + ""memos-ready"": ""alla anteckningar är redo 🎉"", + ""restored-successfully"": ""Återställdes framgångsrikt"", + ""memo-updated-datetime"": ""Anteckning skapad datum och tid ändrad"", + ""invalid-created-datetime"": ""Ogiltig skapad datumtid."", + ""change-memo-created-time"": ""Ändra anteckning skapade tid"", + ""memo-not-found"": ""Anteckning hittades inte."", + ""fill-all"": ""Var god fyll i alla fält."", + ""password-not-match"": ""Lösenorden matchar inte."", + ""new-password-not-match"": ""Nya lösenord matchar inte."", + ""image-load-failed"": ""Bildladdning misslyckades"", + ""fill-form"": ""Vänligen fyll i detta formulär"", + ""login-failed"": ""Inloggningen misslyckades"", + ""signup-failed"": ""Registrering misslyckades"", + ""user-not-found"": ""Användaren hittades inte"", + ""password-changed"": ""Lösenord ändrat"", + ""private-only"": ""Denna anteckning är privat."", + ""copied"": ""Kopierad"", + ""succeed-copy-content"": ""Innehåll kopierades framgångsrikt."", + ""succeed-copy-link"": ""Länk kopierades framgångsrikt."", + ""change-resource-filename"": ""Ändra resursfilnamn"", + ""resource-filename-updated"": ""Resursfilnamn ändrat."", + ""invalid-resource-filename"": ""Ogiltligt filnamn."", + ""click-to-save-the-image"": ""Klicka för att spara bilden"", + ""generating-the-screenshot"": ""Genererar skärmdumpen..."", + ""count-selected-resources"": ""Totalt valt"", + ""succeed-vacuum-database"": ""Succeed to vacuum database"", + ""succeed-update-additional-style"": ""Ytterligare stil uppdaterades framgångsrikt."", + ""succeed-copy-resource-link"": ""Resurslänk kopierades framgångsrikt."", + ""succeed-update-customized-profile"": ""Profil framgångsrikt anpassad."", + ""succeed-update-additional-script"": ""Ytterligare skript uppdateras framgångsrikt."", + ""update-succeed"": ""Uppdateras framgångsrikt"", + ""succeed-copy-code"": ""Kod kopierades framgångsrikt."", + ""page-not-found"": ""404 - Sidan hittades inte 😥"" }, - ""storage"": ""Lagring"", - ""sso"": ""SSO"" - }, - ""amount-text"": { - ""memo_one"": ""ANTECKNING"", - ""memo_other"": ""ANTECKNINGAR"", - ""tag_one"": ""TAGG"", - ""tag_other"": ""TAGGAR"", - ""day_one"": ""DAG"", - ""day_other"": ""DAGAR"" - }, - ""message"": { - ""no-memos"": ""inga anteckningar 🌃"", - ""memos-ready"": ""alla anteckningar är redo 🎉"", - ""restored-successfully"": ""Återställdes framgångsrikt"", - ""memo-updated-datetime"": ""Anteckning skapad datum och tid ändrad"", - ""invalid-created-datetime"": ""Ogiltig skapad datumtid."", - ""change-memo-created-time"": ""Ändra anteckning skapade tid"", - ""memo-not-found"": ""Anteckning hittades inte."", - ""fill-all"": ""Var god fyll i alla fält."", - ""password-not-match"": ""Lösenorden matchar inte."", - ""new-password-not-match"": ""Nya lösenord matchar inte."", - ""image-load-failed"": ""Bildladdning misslyckades"", - ""fill-form"": ""Vänligen fyll i detta formulär"", - ""login-failed"": ""Inloggningen misslyckades"", - ""signup-failed"": ""Registrering misslyckades"", - ""user-not-found"": ""Användaren hittades inte"", - ""password-changed"": ""Lösenord ändrat"", - ""private-only"": ""Denna anteckning är privat."", - ""copied"": ""Kopierad"", - ""succeed-copy-content"": ""Innehåll kopierades framgångsrikt."", - ""succeed-copy-link"": ""Länk kopierades framgångsrikt."", - ""change-resource-filename"": ""Ändra resursfilnamn"", - ""resource-filename-updated"": ""Resursfilnamn ändrat."", - ""invalid-resource-filename"": ""Ogiltligt filnamn."", - ""click-to-save-the-image"": ""Klicka för att spara bilden"", - ""generating-the-screenshot"": ""Genererar skärmdumpen..."", - ""count-selected-resources"": ""Totalt valt"", - ""too-short"": ""För kort"", - ""too-long"": ""För långt"", - ""not-allow-space"": ""Tillåt inte mellanslag"", - ""not-allow-chinese"": ""Tillåt inte kinesiska"", - ""succeed-vacuum-database"": ""Succeed to vacuum database"", - ""succeed-update-additional-style"": ""Ytterligare stil uppdaterades framgångsrikt."", - ""succeed-copy-resource-link"": ""Resurslänk kopierades framgångsrikt."", - ""succeed-update-customized-profile"": ""Profil framgångsrikt anpassad."", - ""succeed-update-additional-script"": ""Ytterligare skript uppdateras framgångsrikt."", - ""update-succeed"": ""Uppdateras framgångsrikt"", - ""succeed-copy-code"": ""Kod kopierades framgångsrikt."", - ""page-not-found"": ""404 - Sidan hittades inte 😥"" - }, - ""days"": { - ""monday"": ""Måndag"", - ""mon"": ""Mån"", - ""tuesday"": ""Tisdag"", - ""tue"": ""Tis"", - ""wednesday"": ""Onsdag"", - ""wed"": ""Ons"", - ""thursday"": ""Torsdag"", - ""thu"": ""Tors"", - ""friday"": ""Fredag"", - ""fri"": ""Fre"", - ""saturday"": ""Lördag"", - ""sat"": ""Lör"", - ""sunday"": ""Söndag"", - ""sun"": ""Sön"" - } + ""days"": { + ""mon"": ""Mån"", + ""tue"": ""Tis"", + ""wed"": ""Ons"", + ""thu"": ""Tors"", + ""fri"": ""Fre"", + ""sat"": ""Lör"", + ""sun"": ""Sön"" + } } diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json index 431d7f92c41bb..cd121ce9076f6 100644 --- a/web/src/locales/tr.json +++ b/web/src/locales/tr.json @@ -1,251 +1,180 @@ { - ""common"": { - ""about"": ""Hakkında"", - ""email"": ""E-posta"", - ""password"": ""Parola"", - ""repeat-password-short"": ""Tekrar"", - ""repeat-password"": ""Parolayı tekrarlayın"", - ""new-password"": ""Yeni parola"", - ""repeat-new-password"": ""Yeni parolayı tekrarla"", - ""username"": ""Kullanıcı adı"", - ""nickname"": ""Takma ad"", - ""save"": ""Kaydet"", - ""close"": ""Kapat"", - ""cancel"": ""İptal"", - ""create"": ""Oluştur"", - ""change"": ""Değiştir"", - ""confirm"": ""Onayla"", - ""reset"": ""Sıfırla"", - ""language"": ""Dil"", - ""version"": ""Sürüm"", - ""pin"": ""Sabitle"", - ""unpin"": ""Sabitlemeyi kaldır"", - ""edit"": ""Düzenle"", - ""restore"": ""Geri yükle"", - ""delete"": ""Sil"", - ""null"": ""Boş"", - ""share"": ""Paylaş"", - ""archive"": ""Arşivle"", - ""basic"": ""Temel"", - ""admin"": ""Yönetici"", - ""explore"": ""Daha çok keşfet"", - ""sign-in"": ""Giriş yap"", - ""sign-up"": ""Kaydol"", - ""sign-out"": ""Çıkış yap"", - ""back-to-home"": ""Ana sayfaya dön"", - ""type"": ""Tip"", - ""title"": ""Başlık"", - ""filter"": ""Filtre"", - ""tags"": ""Etiketler"", - ""yourself"": ""Sen"", - ""archived-at"": ""Arşivlendi"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Sahip olarak kaydolun"", - ""host-tip"": ""Site sahibi olarak kaydoluyorsunuz."", - ""not-host-tip"": ""Hesabınız yoksa, site sahibiyle iletişime geçin."" - }, - ""sidebar"": { - ""daily-review"": ""Günlük İnceleme"", - ""resources"": ""Kaynaklar"", - ""setting"": ""Ayarlar"", - ""archived"": ""Arşivlenmiş"" - }, - ""resource"": { - ""description"": ""Memos'taki statik kaynaklarınızı (fotoğraflar) görüntüleyin"", - ""no-resources"": ""Kaynak yok."", - ""fetching-data"": ""veriler yükleniyor..."", - ""upload"": ""Yükle"", - ""preview"": ""Önizleme"", - ""copy-link"": ""Bağlantıyı kopyala"", - ""delete-resource"": ""Kaynağı sil"", - ""warning-text"": ""Bu kaynağı silmek istediğinize emin misiniz? BU İŞLEM GERİ ALINAMAZ❗"", - ""linked-amount"": ""Notların sayısı"", - ""rename"": ""Yeniden Adlandır"", - ""warning-text-unused"": ""Kullanılmayan kaynakları silmek istediğinize emin misiniz? BU İŞLEM GERİ ALINAMAZ❗"", - ""no-unused-resources"": ""Kullanılmayan kaynak yok"", - ""name"": ""Ad"", - ""clear"": ""Temizle"" - }, - ""archived"": { - ""archived-memos"": ""Arşivlenmiş Notlar"", - ""no-archived-memos"": ""Arşivlenmiş not yok."", - ""fetching-data"": ""veriler yükleniyor..."" - }, - ""editor"": { - ""editing"": ""Düzenleniyor..."", - ""cancel-edit"": ""İptal et"", - ""save"": ""Kaydet"", - ""placeholder"": ""Düşünceleriniz..."", - ""only-image-supported"": ""Sadece resim dosyaları desteklenir."", - ""cant-empty"": ""Metin boş olamaz"", - ""local"": ""Bilgisayardan"", - ""resources"": ""Yüklenenler"" - }, - ""memo"": { - ""view-detail"": ""Detayları görüntüle"", - ""copy"": ""Kopyala"", - ""copy-link"": ""Bağlantıyı kopyala"", - ""visibility"": { - ""private"": ""Sadece sizin için görünür"", - ""protected"": ""Sadece kullanıcılara görünür"", - ""public"": ""Herkese açık"", - ""disabled"": ""Halka açık notlar devre dışı bırakıldı"" - } - }, - ""memo-list"": { - ""fetching-data"": ""Veriler yükleniyor..."", - ""fetch-more"": ""Daha fazla yükle"" - }, - ""filter"": { - ""new-filter"": ""Yeni filtre"", - ""type"": { - ""tag"": ""Etiket"", - ""type"": ""Tip"", - ""text"": ""Metin"", - ""display-time"": ""Görüntüleme süresi"", - ""visibility"": ""Görünürlük"" + ""common"": { + ""about"": ""Hakkında"", + ""email"": ""E-posta"", + ""password"": ""Parola"", + ""username"": ""Kullanıcı adı"", + ""nickname"": ""Takma ad"", + ""save"": ""Kaydet"", + ""close"": ""Kapat"", + ""cancel"": ""İptal"", + ""create"": ""Oluştur"", + ""change"": ""Değiştir"", + ""confirm"": ""Onayla"", + ""reset"": ""Sıfırla"", + ""language"": ""Dil"", + ""version"": ""Sürüm"", + ""pin"": ""Sabitle"", + ""unpin"": ""Sabitlemeyi kaldır"", + ""edit"": ""Düzenle"", + ""restore"": ""Geri yükle"", + ""delete"": ""Sil"", + ""null"": ""Boş"", + ""share"": ""Paylaş"", + ""archive"": ""Arşivle"", + ""basic"": ""Temel"", + ""admin"": ""Yönetici"", + ""explore"": ""Daha çok keşfet"", + ""sign-in"": ""Giriş yap"", + ""sign-up"": ""Kaydol"", + ""sign-out"": ""Çıkış yap"", + ""type"": ""Tip"", + ""title"": ""Başlık"", + ""filter"": ""Filtre"", + ""tags"": ""Etiketler"", + ""yourself"": ""Sen"", + ""mark"": ""Mark"" }, - ""operator"": { - ""contains"": ""İçerir"", - ""not-contains"": ""İçermez"", - ""is"": ""Eşittir"", - ""is-not"": ""Eşit değildir"", - ""before"": ""Öncesinde"", - ""after"": ""Sonrasında"" + ""auth"": { + ""host-tip"": ""Site sahibi olarak kaydoluyorsunuz."" }, - ""value"": { - ""not-tagged"": ""Etiketlenmemiş"", - ""linked"": ""Bağlantılı"" + ""resource"": { + ""no-resources"": ""Kaynak yok."", + ""fetching-data"": ""veriler yükleniyor..."", + ""copy-link"": ""Bağlantıyı kopyala"", + ""delete-resource"": ""Kaynağı sil"", + ""warning-text"": ""Bu kaynağı silmek istediğinize emin misiniz? BU İŞLEM GERİ ALINAMAZ❗"", + ""linked-amount"": ""Notların sayısı"", + ""warning-text-unused"": ""Kullanılmayan kaynakları silmek istediğinize emin misiniz? BU İŞLEM GERİ ALINAMAZ❗"", + ""no-unused-resources"": ""Kullanılmayan kaynak yok"", + ""clear"": ""Temizle"" }, - ""text-placeholder"": ""Düzenli ifadeler kullanmak için ^ işaretini kullanın"" - }, - ""tag-list"": { - ""tip-text"": ""Oluşturmak için #etiket girin"" - }, - ""search"": { - ""quickly-filter"": ""Hızlı filtre"" - }, - ""setting"": { - ""my-account"": ""Hesabım"", - ""preference"": ""Tercihler"", - ""member"": ""Kullanıcılar"", - ""member-list"": ""Kullanıcı listesi"", - ""system"": ""Sistem"", - ""account-section"": { - ""title"": ""Hesap Bilgisi"", - ""update-information"": ""Bilgi Güncelleme"", - ""change-password"": ""Şifre Değiştirme"" + ""editor"": { + ""editing"": ""Düzenleniyor..."", + ""cancel-edit"": ""İptal et"", + ""save"": ""Kaydet"", + ""placeholder"": ""Düşünceleriniz..."", + ""only-image-supported"": ""Sadece resim dosyaları desteklenir."", + ""cant-empty"": ""Metin boş olamaz"", + ""local"": ""Bilgisayardan"", + ""resources"": ""Yüklenenler"" }, - ""preference-section"": { - ""theme"": ""Tema"", - ""default-memo-visibility"": ""Varsayılan not görünürlüğü"", - ""enable-folding-memo"": ""Notları katlamayı etkinleştir"", - ""editor-font-style"": ""Düzenleyici Yazı Stili"", - ""mobile-editor-style"": ""Mobil Düzenleyici Stili"", - ""default-memo-sort-option"": ""Yer İşareti Görüntüleme Zamanı"", - ""created_ts"": ""Oluşturulma zamanı"", - ""updated_ts"": ""Güncelleme zamanı"", - ""enable-double-click"": ""Düzenlemek için çift tıklatmayı etkinleştir"", - ""auto-collapse"": ""Otomatik Daralt"" + ""memo"": { + ""view-detail"": ""Detayları görüntüle"", + ""copy-link"": ""Bağlantıyı kopyala"", + ""visibility"": { + ""private"": ""Sadece sizin için görünür"", + ""protected"": ""Sadece kullanıcılara görünür"", + ""public"": ""Herkese açık"", + ""disabled"": ""Halka açık notlar devre dışı bırakıldı"" + } }, - ""member-section"": { - ""create-a-member"": ""Kullanıcı oluştur"" + ""tag-list"": { + ""tip-text"": ""Oluşturmak için #etiket girin"" }, - ""system-section"": { - ""server-name"": ""Uygulama Adı"", - ""customize-server"": { - ""title"": ""Uygulamayı özelleştir"", - ""default"": ""Varsayılan: memos"", - ""icon-url"": ""İkon URL'si"" - }, - ""database-file-size"": ""Veritabanı Dosya Boyutu"", - ""allow-user-signup"": ""Kullanıcı Kaydına İzin Ver"", - ""additional-style"": ""Özel Stiller"", - ""additional-script"": ""Özel Scriptler"", - ""additional-style-placeholder"": ""Ek CSS"", - ""additional-script-placeholder"": ""Ek JavaScript"", - ""disable-public-memos"": ""Halka açık notları devre dışı bırak"", - ""display-with-updated-time"": ""Display with updated time"" + ""setting"": { + ""my-account"": ""Hesabım"", + ""preference"": ""Tercihler"", + ""member"": ""Kullanıcılar"", + ""member-list"": ""Kullanıcı listesi"", + ""system"": ""Sistem"", + ""account-section"": { + ""title"": ""Hesap Bilgisi"", + ""update-information"": ""Bilgi Güncelleme"", + ""change-password"": ""Şifre Değiştirme"" + }, + ""preference-section"": { + ""theme"": ""Tema"", + ""default-memo-visibility"": ""Varsayılan not görünürlüğü"", + ""enable-folding-memo"": ""Notları katlamayı etkinleştir"", + ""editor-font-style"": ""Düzenleyici Yazı Stili"", + ""mobile-editor-style"": ""Mobil Düzenleyici Stili"", + ""default-memo-sort-option"": ""Yer İşareti Görüntüleme Zamanı"", + ""created_ts"": ""Oluşturulma zamanı"", + ""updated_ts"": ""Güncelleme zamanı"", + ""enable-double-click"": ""Düzenlemek için çift tıklatmayı etkinleştir"", + ""auto-collapse"": ""Otomatik Daralt"" + }, + ""member-section"": { + ""create-a-member"": ""Kullanıcı oluştur"" + }, + ""system-section"": { + ""server-name"": ""Uygulama Adı"", + ""customize-server"": { + ""title"": ""Uygulamayı özelleştir"", + ""default"": ""Varsayılan: memos"", + ""icon-url"": ""İkon URL'si"" + }, + ""database-file-size"": ""Veritabanı Dosya Boyutu"", + ""allow-user-signup"": ""Kullanıcı Kaydına İzin Ver"", + ""additional-style"": ""Özel Stiller"", + ""additional-script"": ""Özel Scriptler"", + ""additional-style-placeholder"": ""Ek CSS"", + ""additional-script-placeholder"": ""Ek JavaScript"", + ""disable-public-memos"": ""Halka açık notları devre dışı bırak"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Otomatik"", + ""light"": ""Her zaman açık renkli"", + ""dark"": ""Her zaman koyu renkli"" + }, + ""storage"": ""Depolama"", + ""storage-section"": { + ""update-a-service"": ""Hizmeti güncelle"", + ""warning-text"": ""Bu depolama hizmetini silmek istediğinizden emin misiniz? BU İŞLEM GERİ ALINAMAZ❗"", + ""delete-storage"": ""Depolamayı Sil"", + ""storage-services-list"": ""Depolama hizmeti listesi"", + ""create-a-service"": ""Hizmet oluştur"" + }, + ""sso"": ""SSO"" }, - ""appearance-option"": { - ""system"": ""Otomatik"", - ""light"": ""Her zaman açık renkli"", - ""dark"": ""Her zaman koyu renkli"" + ""amount-text"": { + ""memo_one"": ""NOT"", + ""memo_other"": ""NOTLAR"" }, - ""storage"": ""Depolama"", - ""storage-section"": { - ""update-a-service"": ""Hizmeti güncelle"", - ""warning-text"": ""Bu depolama hizmetini silmek istediğinizden emin misiniz? BU İŞLEM GERİ ALINAMAZ❗"", - ""delete-storage"": ""Depolamayı Sil"", - ""storage-services-list"": ""Depolama hizmeti listesi"", - ""create-a-service"": ""Hizmet oluştur"" + ""message"": { + ""memos-ready"": ""daha fazla not yok 🎉"", + ""restored-successfully"": ""Başarıyla geri yüklendi."", + ""memo-updated-datetime"": ""Oluşturma zamanı değiştirildi."", + ""invalid-created-datetime"": ""Oluşturma zamanı geçersiz."", + ""change-memo-created-time"": ""Not oluşturma zamanını değiştir"", + ""memo-not-found"": ""Not bulunamadı."", + ""fill-all"": ""Lütfen tüm alanları doldurun."", + ""password-not-match"": ""Parolalar eşleşmiyor."", + ""new-password-not-match"": ""Yeni parolalar eşleşmiyor."", + ""image-load-failed"": ""Resim yüklenemedi"", + ""fill-form"": ""Lütfen formu doldurun"", + ""login-failed"": ""Giriş başarısız"", + ""signup-failed"": ""Kayıt başarısız"", + ""user-not-found"": ""Kullanıcı bulunamadı"", + ""password-changed"": ""Şifre değiştirildi"", + ""private-only"": ""Bu not özel."", + ""copied"": ""Kopyalandı"", + ""succeed-copy-content"": ""Metin panosuna metin kopyalandı."", + ""succeed-copy-link"": ""Bağlantı panosuna bağlantı kopyalandı."", + ""change-resource-filename"": ""Dosya adını değiştir"", + ""resource-filename-updated"": ""Dosya adı güncellendi."", + ""invalid-resource-filename"": ""Geçersiz dosya adı."", + ""click-to-save-the-image"": ""Kaydetmek için tıklayın"", + ""generating-the-screenshot"": ""Ekran görüntüsü oluşturuluyor..."", + ""count-selected-resources"": ""Toplam seçilen"", + ""succeed-vacuum-database"": ""DB vakumlandı"", + ""succeed-update-additional-style"": ""Stiller başarıyla eklendi"", + ""succeed-copy-resource-link"": ""Kaynak bağlantısı panosuna kopyalandı"", + ""succeed-update-customized-profile"": ""Özel profil başarıyla güncellendi"", + ""succeed-update-additional-script"": ""Ek scriptler başarıyla eklendi"", + ""update-succeed"": ""Başarıyla güncellendi"", + ""succeed-copy-code"": ""Kod panosuna kopyalandı"", + ""page-not-found"": ""404 - Sayfa Bulunamadı 😥"" }, - ""sso"": ""SSO"" - }, - ""amount-text"": { - ""memo_one"": ""NOT"", - ""tag_one"": ""ETİKET"", - ""day_one"": ""GÜN"", - ""day_other"": ""GÜNLER"", - ""memo_other"": ""NOTLAR"", - ""tag_other"": ""ETİKETLER"" - }, - ""message"": { - ""no-memos"": ""not yok 🌃"", - ""memos-ready"": ""daha fazla not yok 🎉"", - ""restored-successfully"": ""Başarıyla geri yüklendi."", - ""memo-updated-datetime"": ""Oluşturma zamanı değiştirildi."", - ""invalid-created-datetime"": ""Oluşturma zamanı geçersiz."", - ""change-memo-created-time"": ""Not oluşturma zamanını değiştir"", - ""memo-not-found"": ""Not bulunamadı."", - ""fill-all"": ""Lütfen tüm alanları doldurun."", - ""password-not-match"": ""Parolalar eşleşmiyor."", - ""new-password-not-match"": ""Yeni parolalar eşleşmiyor."", - ""image-load-failed"": ""Resim yüklenemedi"", - ""fill-form"": ""Lütfen formu doldurun"", - ""login-failed"": ""Giriş başarısız"", - ""signup-failed"": ""Kayıt başarısız"", - ""user-not-found"": ""Kullanıcı bulunamadı"", - ""password-changed"": ""Şifre değiştirildi"", - ""private-only"": ""Bu not özel."", - ""copied"": ""Kopyalandı"", - ""succeed-copy-content"": ""Metin panosuna metin kopyalandı."", - ""succeed-copy-link"": ""Bağlantı panosuna bağlantı kopyalandı."", - ""change-resource-filename"": ""Dosya adını değiştir"", - ""resource-filename-updated"": ""Dosya adı güncellendi."", - ""invalid-resource-filename"": ""Geçersiz dosya adı."", - ""click-to-save-the-image"": ""Kaydetmek için tıklayın"", - ""generating-the-screenshot"": ""Ekran görüntüsü oluşturuluyor..."", - ""count-selected-resources"": ""Toplam seçilen"", - ""too-short"": ""Çok kısa"", - ""too-long"": ""Çok uzun"", - ""not-allow-space"": ""Boşluk izin verilmez"", - ""not-allow-chinese"": ""Çince karakterler izin verilmez"", - ""succeed-vacuum-database"": ""DB vakumlandı"", - ""succeed-update-additional-style"": ""Stiller başarıyla eklendi"", - ""succeed-copy-resource-link"": ""Kaynak bağlantısı panosuna kopyalandı"", - ""succeed-update-customized-profile"": ""Özel profil başarıyla güncellendi"", - ""succeed-update-additional-script"": ""Ek scriptler başarıyla eklendi"", - ""update-succeed"": ""Başarıyla güncellendi"", - ""succeed-copy-code"": ""Kod panosuna kopyalandı"", - ""page-not-found"": ""404 - Sayfa Bulunamadı 😥"" - }, - ""days"": { - ""monday"": ""Pazartesi"", - ""mon"": ""Paz"", - ""tuesday"": ""Salı"", - ""tue"": ""Sal"", - ""wednesday"": ""Çarşamba"", - ""wed"": ""Çar"", - ""thursday"": ""Perşembe"", - ""thu"": ""Per"", - ""friday"": ""Cuma"", - ""fri"": ""Cum"", - ""saturday"": ""Cumartesi"", - ""sat"": ""Cum"", - ""sunday"": ""Pazar"", - ""sun"": ""Paz"" - } + ""days"": { + ""mon"": ""Paz"", + ""tue"": ""Sal"", + ""wed"": ""Çar"", + ""thu"": ""Per"", + ""fri"": ""Cum"", + ""sat"": ""Cum"", + ""sun"": ""Paz"" + } } diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json index 646305b1c66b6..f5befe15e2e57 100644 --- a/web/src/locales/uk.json +++ b/web/src/locales/uk.json @@ -1,261 +1,190 @@ { - ""common"": { - ""about"": ""Про Memos"", - ""email"": ""Емейл"", - ""password"": ""Пароль"", - ""repeat-password-short"": ""Повторіть"", - ""repeat-password"": ""Повторіть пароль"", - ""new-password"": ""Новий парль"", - ""repeat-new-password"": ""Повторіть новий пароль"", - ""username"": ""Ім'я користувача"", - ""nickname"": ""Нікнейм"", - ""save"": ""Зберегти"", - ""close"": ""Закрити"", - ""cancel"": ""Скасувати"", - ""create"": ""Створити"", - ""change"": ""Змінити"", - ""confirm"": ""Підтвердити"", - ""reset"": ""Стерти"", - ""language"": ""Мова"", - ""version"": ""Версія"", - ""pin"": ""Закріпити"", - ""unpin"": ""Відкріпити"", - ""edit"": ""Редагувати"", - ""restore"": ""Відновити"", - ""delete"": ""Видалити"", - ""null"": ""Пусто"", - ""share"": ""Поділитися"", - ""archive"": ""Архівувати"", - ""basic"": ""Базові"", - ""admin"": ""Адміністратор"", - ""explore"": ""Більше"", - ""sign-in"": ""Увійти"", - ""sign-up"": ""Зареєструватися"", - ""sign-out"": ""Вийти"", - ""back-to-home"": ""Повернутися на головну"", - ""type"": ""Типу"", - ""title"": ""Заголовок"", - ""filter"": ""Фільтр"", - ""tags"": ""Теги"", - ""yourself"": ""Ви"", - ""archived-at"": ""Заархівовано"", - ""changed"": ""змінено"", - ""update-on"": ""Оновлено"", - ""fold"": ""Згорнути"", - ""expand"": ""Розгорнути"", - ""image"": ""Світлина"", - ""link"": ""Посилання"", - ""vacuum"": ""Стиснути"", - ""select"": ""Вибрати"", - ""database"": ""Database"", - ""avatar"": ""Avatar"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Зареєструватися як власник"", - ""host-tip"": ""Ви реєструєте власника сайту."", - ""not-host-tip"": ""Якщо ви не маєте акаунту, зверніться до власника сайту."" - }, - ""sidebar"": { - ""daily-review"": ""По днях"", - ""resources"": ""Ресурси"", - ""setting"": ""Налаштування"", - ""archived"": ""Заархівовані"" - }, - ""resource"": { - ""description"": ""Переглянути ваші статичні ресурси в Memos (світлини)"", - ""no-resources"": ""Немає ресурсів."", - ""fetching-data"": ""завантаження даних..."", - ""upload"": ""Вивантажити"", - ""preview"": ""Попередній перегляд"", - ""copy-link"": ""Копіювати посилання"", - ""delete-resource"": ""Видалити ресурс"", - ""warning-text"": ""Ви впевнені що хочете видалити цей ресурс? ЦЮ ДІЮ НЕМОЖЛИВО СКАСУВАТИ❗"", - ""linked-amount"": ""Кількість нотаток"", - ""rename"": ""Переіменувати"", - ""warning-text-unused"": ""Ви впенвені що хочете видалити невикористовувані ресурси? ЦЮ ДІЮ НЕМОЖЛИВО СКАСУВАТИ❗"", - ""no-unused-resources"": ""Немає невикористаних ресурсів"", - ""name"": ""Назва"", - ""clear"": ""Clear"" - }, - ""archived"": { - ""archived-memos"": ""Заархівовані нотатки"", - ""no-archived-memos"": ""Немає заархівованих нотаток."", - ""fetching-data"": ""завантаження даних..."" - }, - ""editor"": { - ""editing"": ""Редагування..."", - ""cancel-edit"": ""Скасувати"", - ""save"": ""Зберегти"", - ""placeholder"": ""Ваші думки..."", - ""only-image-supported"": ""Тільки файли-світлини підтримуються."", - ""cant-empty"": ""Текст не може бути порожнім"", - ""local"": ""З комп'ютера"", - ""resources"": ""Завантажені"" - }, - ""memo"": { - ""view-detail"": ""Деталі"", - ""copy"": ""Копіювати"", - ""copy-link"": ""Копіювати посилання"", - ""visibility"": { - ""private"": ""Видимий тільки вам"", - ""protected"": ""Видимий тільки користувачам"", - ""public"": ""Видимий усім"", - ""disabled"": ""Public memos are disabled"" - } - }, - ""memo-list"": { - ""fetching-data"": ""завантаження даних..."", - ""fetch-more"": ""Завантажити більше"" - }, - ""filter"": { - ""new-filter"": ""Новий фільтр"", - ""type"": { - ""tag"": ""Тег"", - ""type"": ""Тип"", - ""text"": ""Текст"", - ""display-time"": ""Час відображення"", - ""visibility"": ""Видимість"" + ""common"": { + ""about"": ""Про Memos"", + ""email"": ""Емейл"", + ""password"": ""Пароль"", + ""username"": ""Ім'я користувача"", + ""nickname"": ""Нікнейм"", + ""save"": ""Зберегти"", + ""close"": ""Закрити"", + ""cancel"": ""Скасувати"", + ""create"": ""Створити"", + ""change"": ""Змінити"", + ""confirm"": ""Підтвердити"", + ""reset"": ""Стерти"", + ""language"": ""Мова"", + ""version"": ""Версія"", + ""pin"": ""Закріпити"", + ""unpin"": ""Відкріпити"", + ""edit"": ""Редагувати"", + ""restore"": ""Відновити"", + ""delete"": ""Видалити"", + ""null"": ""Пусто"", + ""share"": ""Поділитися"", + ""archive"": ""Архівувати"", + ""basic"": ""Базові"", + ""admin"": ""Адміністратор"", + ""explore"": ""Більше"", + ""sign-in"": ""Увійти"", + ""sign-up"": ""Зареєструватися"", + ""sign-out"": ""Вийти"", + ""type"": ""Типу"", + ""title"": ""Заголовок"", + ""filter"": ""Фільтр"", + ""tags"": ""Теги"", + ""yourself"": ""Ви"", + ""changed"": ""змінено"", + ""fold"": ""Згорнути"", + ""expand"": ""Розгорнути"", + ""image"": ""Світлина"", + ""link"": ""Посилання"", + ""vacuum"": ""Стиснути"", + ""select"": ""Вибрати"", + ""database"": ""Database"", + ""avatar"": ""Avatar"", + ""mark"": ""Mark"" }, - ""operator"": { - ""contains"": ""Містить"", - ""not-contains"": ""Не містить"", - ""is"": ""Є"", - ""is-not"": ""Не є"", - ""before"": ""До"", - ""after"": ""Після"" + ""auth"": { + ""host-tip"": ""Ви реєструєте власника сайту."" }, - ""value"": { - ""not-tagged"": ""Немає тегів"", - ""linked"": ""Має посилання"" + ""resource"": { + ""no-resources"": ""Немає ресурсів."", + ""fetching-data"": ""завантаження даних..."", + ""copy-link"": ""Копіювати посилання"", + ""delete-resource"": ""Видалити ресурс"", + ""warning-text"": ""Ви впевнені що хочете видалити цей ресурс? ЦЮ ДІЮ НЕМОЖЛИВО СКАСУВАТИ❗"", + ""linked-amount"": ""Кількість нотаток"", + ""warning-text-unused"": ""Ви впенвені що хочете видалити невикористовувані ресурси? ЦЮ ДІЮ НЕМОЖЛИВО СКАСУВАТИ❗"", + ""no-unused-resources"": ""Немає невикористаних ресурсів"", + ""clear"": ""Clear"" }, - ""text-placeholder"": ""Почніть з ^ щоб використовувати регулярні вирази"" - }, - ""tag-list"": { - ""tip-text"": ""Введіть `#tag` щоб створити"" - }, - ""search"": { - ""quickly-filter"": ""Швидкий фільтр"" - }, - ""setting"": { - ""my-account"": ""Мій аккаунт"", - ""preference"": ""Налаштування"", - ""member"": ""Користувачі"", - ""member-list"": ""Список користувачів"", - ""system"": ""Системні"", - ""account-section"": { - ""title"": ""Інформація про акаунт"", - ""update-information"": ""Оновити інформацію"", - ""change-password"": ""Змінити пароль"" + ""editor"": { + ""editing"": ""Редагування..."", + ""cancel-edit"": ""Скасувати"", + ""save"": ""Зберегти"", + ""placeholder"": ""Ваші думки..."", + ""only-image-supported"": ""Тільки файли-світлини підтримуються."", + ""cant-empty"": ""Текст не може бути порожнім"", + ""local"": ""З комп'ютера"", + ""resources"": ""Завантажені"" }, - ""preference-section"": { - ""theme"": ""Тема"", - ""default-memo-visibility"": ""Стандартна видимість нотаток"", - ""enable-folding-memo"": ""Згортати нотатки"", - ""editor-font-style"": ""Стиль шрифта"", - ""mobile-editor-style"": ""Стиль мобільного редактора"", - ""default-memo-sort-option"": ""Час відображення закладки"", - ""created_ts"": ""Час створення"", - ""updated_ts"": ""Час оновлення"", - ""enable-double-click"": ""Enable double-click to edit"", - ""auto-collapse"": ""Автоматичне згортання"" + ""memo"": { + ""view-detail"": ""Деталі"", + ""copy-link"": ""Копіювати посилання"", + ""visibility"": { + ""private"": ""Видимий тільки вам"", + ""protected"": ""Видимий тільки користувачам"", + ""public"": ""Видимий усім"", + ""disabled"": ""Public memos are disabled"" + } }, - ""member-section"": { - ""create-a-member"": ""Створити користувача"" + ""tag-list"": { + ""tip-text"": ""Введіть `#tag` щоб створити"" }, - ""system-section"": { - ""server-name"": ""Назва додатка"", - ""customize-server"": { - ""title"": ""Налаштувати додаток"", - ""default"": ""За замовчуванням: memos"", - ""icon-url"": ""URL іконки"" - }, - ""database-file-size"": ""Розмір файлу бази даних"", - ""allow-user-signup"": ""Дозволити реєстрацію користувачів"", - ""additional-style"": ""Кастомні стилі"", - ""additional-script"": ""Кастомні скрипти"", - ""additional-style-placeholder"": ""Додатковий CSS"", - ""additional-script-placeholder"": ""Додатковий JavaScript"", - ""disable-public-memos"": ""Disable public memos"", - ""display-with-updated-time"": ""Display with updated time"" + ""setting"": { + ""my-account"": ""Мій аккаунт"", + ""preference"": ""Налаштування"", + ""member"": ""Користувачі"", + ""member-list"": ""Список користувачів"", + ""system"": ""Системні"", + ""account-section"": { + ""title"": ""Інформація про акаунт"", + ""update-information"": ""Оновити інформацію"", + ""change-password"": ""Змінити пароль"" + }, + ""preference-section"": { + ""theme"": ""Тема"", + ""default-memo-visibility"": ""Стандартна видимість нотаток"", + ""enable-folding-memo"": ""Згортати нотатки"", + ""editor-font-style"": ""Стиль шрифта"", + ""mobile-editor-style"": ""Стиль мобільного редактора"", + ""default-memo-sort-option"": ""Час відображення закладки"", + ""created_ts"": ""Час створення"", + ""updated_ts"": ""Час оновлення"", + ""enable-double-click"": ""Enable double-click to edit"", + ""auto-collapse"": ""Автоматичне згортання"" + }, + ""member-section"": { + ""create-a-member"": ""Створити користувача"" + }, + ""system-section"": { + ""server-name"": ""Назва додатка"", + ""customize-server"": { + ""title"": ""Налаштувати додаток"", + ""default"": ""За замовчуванням: memos"", + ""icon-url"": ""URL іконки"" + }, + ""database-file-size"": ""Розмір файлу бази даних"", + ""allow-user-signup"": ""Дозволити реєстрацію користувачів"", + ""additional-style"": ""Кастомні стилі"", + ""additional-script"": ""Кастомні скрипти"", + ""additional-style-placeholder"": ""Додатковий CSS"", + ""additional-script-placeholder"": ""Додатковий JavaScript"", + ""disable-public-memos"": ""Disable public memos"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""appearance-option"": { + ""system"": ""Автоматично"", + ""light"": ""Завжди світла"", + ""dark"": ""Завжди темна"" + }, + ""storage"": ""Storage"", + ""storage-section"": { + ""update-a-service"": ""Update a service"", + ""warning-text"": ""Are you sure to delete this storage service? THIS ACTION IS IRREVERSIBLE❗"", + ""delete-storage"": ""Delete Storage"", + ""storage-services-list"": ""Storage service list"", + ""create-a-service"": ""Create a service"" + }, + ""sso"": ""SSO"" }, - ""appearance-option"": { - ""system"": ""Автоматично"", - ""light"": ""Завжди світла"", - ""dark"": ""Завжди темна"" + ""amount-text"": { + ""memo_one"": ""НОТАТКА"", + ""memo_few"": """", + ""memo_many"": """" }, - ""storage"": ""Storage"", - ""storage-section"": { - ""update-a-service"": ""Update a service"", - ""warning-text"": ""Are you sure to delete this storage service? THIS ACTION IS IRREVERSIBLE❗"", - ""delete-storage"": ""Delete Storage"", - ""storage-services-list"": ""Storage service list"", - ""create-a-service"": ""Create a service"" + ""message"": { + ""memos-ready"": ""більше нотаток немає 🎉"", + ""restored-successfully"": ""Відновлення успішне."", + ""memo-updated-datetime"": ""Час створення змінено."", + ""invalid-created-datetime"": ""Невірний час створення."", + ""change-memo-created-time"": ""Змінити час створення нотатки"", + ""memo-not-found"": ""Нотатку не знайдено."", + ""fill-all"": ""Будь ласка заповність усі поля."", + ""password-not-match"": ""Паролі не співпадають."", + ""new-password-not-match"": ""Нові паролі не співпадають."", + ""image-load-failed"": ""Помилка завантаження зображення"", + ""fill-form"": ""Будь ласка заповніть форму"", + ""login-failed"": ""Помилка входу"", + ""signup-failed"": ""Помилка реєстрації"", + ""user-not-found"": ""Користувача не знайдено"", + ""password-changed"": ""Пароль змінено"", + ""private-only"": ""Ця нотатка приватна."", + ""copied"": ""Скопійовано"", + ""succeed-copy-content"": ""Скопійовано текст в буфер обміну."", + ""succeed-copy-link"": ""Скопійовано посилання в буфер обміну."", + ""change-resource-filename"": ""Змінити назву файла"", + ""resource-filename-updated"": ""Назву файла змінено."", + ""invalid-resource-filename"": ""Невірна назва файла."", + ""click-to-save-the-image"": ""Натисніть щоб зберегти світлину"", + ""generating-the-screenshot"": ""Створюємо знімок..."", + ""count-selected-resources"": ""Всього вибрано"", + ""succeed-vacuum-database"": ""БД стиснуто"", + ""succeed-update-additional-style"": ""Успішно додано стилі"", + ""succeed-copy-resource-link"": ""Посилання на ресурс скопійовано в буфер обміну"", + ""succeed-update-customized-profile"": ""Успішно збережено власний профіль"", + ""succeed-update-additional-script"": ""Успішно додано скрипти"", + ""update-succeed"": ""Збережно"", + ""succeed-copy-code"": ""Succeed to copy code to clipboard."", + ""page-not-found"": ""404 - Page Not Found 😥"" }, - ""sso"": ""SSO"" - }, - ""amount-text"": { - ""memo_one"": ""НОТАТКА"", - ""tag_one"": ""ТЕГ"", - ""day_one"": ""ДЕНЬ"", - ""day_other"": ""DAYS"", - ""memo_other"": ""MEMOS"", - ""tag_other"": ""TAGS"" - }, - ""message"": { - ""no-memos"": ""немає нотаток 🌃"", - ""memos-ready"": ""більше нотаток немає 🎉"", - ""restored-successfully"": ""Відновлення успішне."", - ""memo-updated-datetime"": ""Час створення змінено."", - ""invalid-created-datetime"": ""Невірний час створення."", - ""change-memo-created-time"": ""Змінити час створення нотатки"", - ""memo-not-found"": ""Нотатку не знайдено."", - ""fill-all"": ""Будь ласка заповність усі поля."", - ""password-not-match"": ""Паролі не співпадають."", - ""new-password-not-match"": ""Нові паролі не співпадають."", - ""image-load-failed"": ""Помилка завантаження зображення"", - ""fill-form"": ""Будь ласка заповніть форму"", - ""login-failed"": ""Помилка входу"", - ""signup-failed"": ""Помилка реєстрації"", - ""user-not-found"": ""Користувача не знайдено"", - ""password-changed"": ""Пароль змінено"", - ""private-only"": ""Ця нотатка приватна."", - ""copied"": ""Скопійовано"", - ""succeed-copy-content"": ""Скопійовано текст в буфер обміну."", - ""succeed-copy-link"": ""Скопійовано посилання в буфер обміну."", - ""change-resource-filename"": ""Змінити назву файла"", - ""resource-filename-updated"": ""Назву файла змінено."", - ""invalid-resource-filename"": ""Невірна назва файла."", - ""click-to-save-the-image"": ""Натисніть щоб зберегти світлину"", - ""generating-the-screenshot"": ""Створюємо знімок..."", - ""count-selected-resources"": ""Всього вибрано"", - ""too-short"": ""Занадто коротке"", - ""too-long"": ""Занадто довге"", - ""not-allow-space"": ""Пробіл не дозволено"", - ""not-allow-chinese"": ""Китайські символи не дозволено"", - ""succeed-vacuum-database"": ""БД стиснуто"", - ""succeed-update-additional-style"": ""Успішно додано стилі"", - ""succeed-copy-resource-link"": ""Посилання на ресурс скопійовано в буфер обміну"", - ""succeed-update-customized-profile"": ""Успішно збережено власний профіль"", - ""succeed-update-additional-script"": ""Успішно додано скрипти"", - ""update-succeed"": ""Збережно"", - ""succeed-copy-code"": ""Succeed to copy code to clipboard."", - ""page-not-found"": ""404 - Page Not Found 😥"" - }, - ""days"": { - ""monday"": ""Понеділок"", - ""mon"": ""Пон."", - ""tuesday"": ""Вівторок"", - ""tue"": ""Вів."", - ""wednesday"": ""Середа"", - ""wed"": ""Сер."", - ""thursday"": ""Четвер"", - ""thu"": ""Чет."", - ""friday"": ""П'ятниця"", - ""fri"": ""П'ят."", - ""saturday"": ""Субота"", - ""sat"": ""Суб."", - ""sunday"": ""Неділя"", - ""sun"": ""Нед."" - } + ""days"": { + ""mon"": ""Пон."", + ""tue"": ""Вів."", + ""wed"": ""Сер."", + ""thu"": ""Чет."", + ""fri"": ""П'ят."", + ""sat"": ""Суб."", + ""sun"": ""Нед."" + } } diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json index 505c1246c04e1..0d1849410feaf 100644 --- a/web/src/locales/vi.json +++ b/web/src/locales/vi.json @@ -1,261 +1,188 @@ { - ""common"": { - ""about"": ""Thông tin"", - ""email"": ""Email"", - ""password"": ""Mật khẩu"", - ""repeat-password-short"": ""Nhập lại"", - ""repeat-password"": ""Nhập lại mật khẩu"", - ""new-password"": ""Mật khẩu mới"", - ""repeat-new-password"": ""Nhập lại mật khẩu mới"", - ""username"": ""Tên đăng nhập"", - ""nickname"": ""Biệt danh"", - ""save"": ""Lưu"", - ""close"": ""Đóng"", - ""cancel"": ""Hủy"", - ""create"": ""Tạo mới"", - ""change"": ""Thay đổi"", - ""confirm"": ""Xác nhận"", - ""reset"": ""Khôi phục"", - ""language"": ""Ngôn ngữ"", - ""version"": ""Phiên bản"", - ""pin"": ""Ghim"", - ""unpin"": ""Bỏ ghim"", - ""edit"": ""Chỉnh sửa"", - ""restore"": ""Khôi phục"", - ""delete"": ""Xóa"", - ""null"": ""Trống rỗng"", - ""share"": ""Chia sẻ"", - ""archive"": ""Lưu trữ"", - ""basic"": ""Cơ bản"", - ""admin"": ""Quản trị"", - ""explore"": ""Khám phá"", - ""sign-in"": ""Đăng nhập"", - ""sign-up"": ""Đăng ký"", - ""sign-out"": ""Đăng xuất"", - ""back-to-home"": ""Về trang chủ"", - ""type"": ""Kiểu"", - ""title"": ""Tiêu đề"", - ""filter"": ""Bộ lọc"", - ""tags"": ""Thẻ"", - ""yourself"": ""Chính bạn"", - ""archived-at"": ""Lưu trữ lúc"", - ""changed"": ""đã thay đổi"", - ""update-on"": ""Cập nhật lúc"", - ""fold"": ""Cuộn"", - ""expand"": ""Mở rộng"", - ""image"": ""Hình ảnh"", - ""link"": ""Liên kết"", - ""vacuum"": ""Dọn dẹp"", - ""select"": ""Chọn"", - ""avatar"": ""Avatar"", - ""database"": ""Cơ sở dữ liệu"", - ""mark"": ""Mark"" - }, - ""auth"": { - ""signup-as-host"": ""Đăng ký tài khoản quản trị viên"", - ""host-tip"": ""Bạn đang đăng ký với tư cách quản trị viên của trang web này."", - ""not-host-tip"": ""Nếu chưa có tài khoản, bạn cần phải liên hệ quản trị viên của trang web."" - }, - ""sidebar"": { - ""daily-review"": ""Đánh giá hàng ngày"", - ""resources"": ""Tài Nguyên"", - ""setting"": ""Cài Đặt"", - ""archived"": ""Lưu Trữ"" - }, - ""resource"": { - ""description"": ""Xem toàn bộ tài nguyên của trang web. Ví dụ như các hình ảnh."", - ""no-resources"": ""Không có tài nguyên."", - ""fetching-data"": ""đang tải dữ liệu..."", - ""upload"": ""Tải lên"", - ""preview"": ""Xem trước"", - ""copy-link"": ""Sao chép"", - ""delete-resource"": ""Xóa tài nguyên"", - ""warning-text"": ""Bạn có chắc chắn xóa tài nguyên này không? HÀNH ĐỘNG KHÔNG THỂ KHÔI PHỤC❗"", - ""linked-amount"": ""Số ghi chú đã liên kết"", - ""rename"": ""Đổi tên"", - ""warning-text-unused"": ""Bạn có chắc chắn xóa những tài nguyên không sử dụng này không? HÀNH ĐỘNG KHÔNG THỂ KHÔI PHỤC❗"", - ""no-unused-resources"": ""Không có tài nguyên không sử dụng"", - ""clear"": ""Xóa tất cả"", - ""name"": ""Tên"" - }, - ""archived"": { - ""archived-memos"": ""Ghi chú đã lưu trữ"", - ""no-archived-memos"": ""Không có ghi chú nào cả."", - ""fetching-data"": ""đang tải dữ liệu..."" - }, - ""editor"": { - ""editing"": ""Đang chỉnh sửa..."", - ""cancel-edit"": ""Thoát chỉnh sửa"", - ""save"": ""Lưu"", - ""placeholder"": ""Bất cứ gì bạn đang nghĩ..."", - ""only-image-supported"": ""Chỉ hỗ trợ hình ảnh."", - ""cant-empty"": ""Nội dung không thể trống"", - ""local"": ""Tải lên"", - ""resources"": ""Tài nguyên"" - }, - ""memo"": { - ""view-detail"": ""Xem Chi Tiết"", - ""copy"": ""Sao Chép"", - ""copy-link"": ""Sao Chép"", - ""visibility"": { - ""private"": ""Riêng tư"", - ""protected"": ""Bảo vệ"", - ""public"": ""Công khai"", - ""disabled"": ""Ghi chú công khai đã bị vô hiệu hóa"" - } - }, - ""memo-list"": { - ""fetching-data"": ""đang tải dữ liệu..."", - ""fetch-more"": ""Nhấp vào đây để tải thêm dữ liệu"" - }, - ""filter"": { - ""new-filter"": ""Bộ Lọc Mới"", - ""type"": { - ""tag"": ""Thẻ"", - ""type"": ""Loại"", - ""text"": ""Văn Bản"", - ""display-time"": ""Thời Gian"", - ""visibility"": ""Hiển Thị"" + ""common"": { + ""about"": ""Thông tin"", + ""email"": ""Email"", + ""password"": ""Mật khẩu"", + ""username"": ""Tên đăng nhập"", + ""nickname"": ""Biệt danh"", + ""save"": ""Lưu"", + ""close"": ""Đóng"", + ""cancel"": ""Hủy"", + ""create"": ""Tạo mới"", + ""change"": ""Thay đổi"", + ""confirm"": ""Xác nhận"", + ""reset"": ""Khôi phục"", + ""language"": ""Ngôn ngữ"", + ""version"": ""Phiên bản"", + ""pin"": ""Ghim"", + ""unpin"": ""Bỏ ghim"", + ""edit"": ""Chỉnh sửa"", + ""restore"": ""Khôi phục"", + ""delete"": ""Xóa"", + ""null"": ""Trống rỗng"", + ""share"": ""Chia sẻ"", + ""archive"": ""Lưu trữ"", + ""basic"": ""Cơ bản"", + ""admin"": ""Quản trị"", + ""explore"": ""Khám phá"", + ""sign-in"": ""Đăng nhập"", + ""sign-up"": ""Đăng ký"", + ""sign-out"": ""Đăng xuất"", + ""type"": ""Kiểu"", + ""title"": ""Tiêu đề"", + ""filter"": ""Bộ lọc"", + ""tags"": ""Thẻ"", + ""yourself"": ""Chính bạn"", + ""changed"": ""đã thay đổi"", + ""fold"": ""Cuộn"", + ""expand"": ""Mở rộng"", + ""image"": ""Hình ảnh"", + ""link"": ""Liên kết"", + ""vacuum"": ""Dọn dẹp"", + ""select"": ""Chọn"", + ""avatar"": ""Avatar"", + ""database"": ""Cơ sở dữ liệu"", + ""mark"": ""Mark"" + }, + ""auth"": { + ""host-tip"": ""Bạn đang đăng ký với tư cách quản trị viên của trang web này."" }, - ""operator"": { - ""contains"": ""Chứa"", - ""not-contains"": ""Không Chứa"", - ""is"": ""Là"", - ""is-not"": ""Không Phải"", - ""before"": ""Trước"", - ""after"": ""Sau"" + ""resource"": { + ""no-resources"": ""Không có tài nguyên."", + ""fetching-data"": ""đang tải dữ liệu..."", + ""copy-link"": ""Sao chép"", + ""delete-resource"": ""Xóa tài nguyên"", + ""warning-text"": ""Bạn có chắc chắn xóa tài nguyên này không? HÀNH ĐỘNG KHÔNG THỂ KHÔI PHỤC❗"", + ""linked-amount"": ""Số ghi chú đã liên kết"", + ""warning-text-unused"": ""Bạn có chắc chắn xóa những tài nguyên không sử dụng này không? HÀNH ĐỘNG KHÔNG THỂ KHÔI PHỤC❗"", + ""no-unused-resources"": ""Không có tài nguyên không sử dụng"", + ""clear"": ""Xóa tất cả"" }, - ""value"": { - ""not-tagged"": ""Không có thẻ"", - ""linked"": ""Có liên kết"" + ""editor"": { + ""editing"": ""Đang chỉnh sửa..."", + ""cancel-edit"": ""Thoát chỉnh sửa"", + ""save"": ""Lưu"", + ""placeholder"": ""Bất cứ gì bạn đang nghĩ..."", + ""only-image-supported"": ""Chỉ hỗ trợ hình ảnh."", + ""cant-empty"": ""Nội dung không thể trống"", + ""local"": ""Tải lên"", + ""resources"": ""Tài nguyên"" }, - ""text-placeholder"": ""Bắt đầu với ^ để sử dụng biểu thức chính quy"" - }, - ""tag-list"": { - ""tip-text"": ""Nhập `#tag` để tạo mới"" - }, - ""search"": { - ""quickly-filter"": ""Lọc nhanh"" - }, - ""setting"": { - ""my-account"": ""Tài Khoản"", - ""preference"": ""Tùy Chỉnh"", - ""member"": ""Thành Viên"", - ""member-list"": ""Danh sách thành viên"", - ""system"": ""Hệ Thống"", - ""account-section"": { - ""title"": ""Thông tin tài khoản"", - ""update-information"": ""Cập nhật thông tin"", - ""change-password"": ""Đổi mật khẩu"" + ""memo"": { + ""view-detail"": ""Xem Chi Tiết"", + ""copy-link"": ""Sao Chép"", + ""visibility"": { + ""private"": ""Riêng tư"", + ""protected"": ""Bảo vệ"", + ""public"": ""Công khai"", + ""disabled"": ""Ghi chú công khai đã bị vô hiệu hóa"" + } }, - ""preference-section"": { - ""theme"": ""Chủ đề"", - ""default-memo-visibility"": ""Chế độ hiển thị mặc định"", - ""enable-folding-memo"": ""Bật ghi chú lồng"", - ""editor-font-style"": ""Phông chữ trình soạn thảo"", - ""mobile-editor-style"": ""Vị trí trình soạn thảo trên di động"", - ""default-memo-sort-option"": ""Thời gian hiện ghi chú"", - ""created_ts"": ""Thời gian tạo"", - ""updated_ts"": ""Thời gian cập nhật"", - ""enable-double-click"": ""Bật nhấp đúp để chỉnh sửa"", - ""auto-collapse"": ""Tự động thu gọn"" + ""tag-list"": { + ""tip-text"": ""Nhập `#tag` để tạo mới"" }, - ""member-section"": { - ""create-a-member"": ""Thêm thành viên"" + ""setting"": { + ""my-account"": ""Tài Khoản"", + ""preference"": ""Tùy Chỉnh"", + ""member"": ""Thành Viên"", + ""member-list"": ""Danh sách thành viên"", + ""system"": ""Hệ Thống"", + ""account-section"": { + ""title"": ""Thông tin tài khoản"", + ""update-information"": ""Cập nhật thông tin"", + ""change-password"": ""Đổi mật khẩu"" + }, + ""preference-section"": { + ""theme"": ""Chủ đề"", + ""default-memo-visibility"": ""Chế độ hiển thị mặc định"", + ""enable-folding-memo"": ""Bật ghi chú lồng"", + ""editor-font-style"": ""Phông chữ trình soạn thảo"", + ""mobile-editor-style"": ""Vị trí trình soạn thảo trên di động"", + ""default-memo-sort-option"": ""Thời gian hiện ghi chú"", + ""created_ts"": ""Thời gian tạo"", + ""updated_ts"": ""Thời gian cập nhật"", + ""enable-double-click"": ""Bật nhấp đúp để chỉnh sửa"", + ""auto-collapse"": ""Tự động thu gọn"" + }, + ""member-section"": { + ""create-a-member"": ""Thêm thành viên"" + }, + ""system-section"": { + ""server-name"": ""Tên máy chủ"", + ""customize-server"": { + ""title"": ""Tùy biến máy chủ"", + ""default"": ""Mặc định là memos"", + ""icon-url"": ""URL biểu tượng"" + }, + ""database-file-size"": ""Kích thước tệp cơ sở dữ liệu"", + ""allow-user-signup"": ""Cho phép người dùng đăng ký"", + ""additional-style"": ""Phong cách bổ sung"", + ""additional-script"": ""Mã lệnh bổ sung"", + ""additional-style-placeholder"": ""Mã CSS bổ sung"", + ""additional-script-placeholder"": ""Mã JavaScript bổ sung"", + ""disable-public-memos"": ""Vô hiệu hóa ghi chú công khai"", + ""display-with-updated-time"": ""Display with updated time"" + }, + ""storage"": ""Kho lưu trữ"", + ""sso"": ""SSO"", + ""storage-section"": { + ""storage-services-list"": ""Danh sách dịch vụ kho lưu trữ"", + ""create-a-service"": ""Thêm dịch vụ kho lưu trữ"", + ""update-a-service"": ""Cập nhật dịch vụ kho lưu trữ"", + ""warning-text"": ""Bạn có chắc chắn xóa tài nguyên này không? HÀNH ĐỘNG NÀY KHÔNG THỂ KHÔI PHỤC❗"", + ""delete-storage"": ""Xóa kho lưu trữ"" + }, + ""appearance-option"": { + ""system"": ""Theo hệ thống"", + ""light"": ""Always light"", + ""dark"": ""Always dark"" + } }, - ""system-section"": { - ""server-name"": ""Tên máy chủ"", - ""customize-server"": { - ""title"": ""Tùy biến máy chủ"", - ""default"": ""Mặc định là memos"", - ""icon-url"": ""URL biểu tượng"" - }, - ""database-file-size"": ""Kích thước tệp cơ sở dữ liệu"", - ""allow-user-signup"": ""Cho phép người dùng đăng ký"", - ""additional-style"": ""Phong cách bổ sung"", - ""additional-script"": ""Mã lệnh bổ sung"", - ""additional-style-placeholder"": ""Mã CSS bổ sung"", - ""additional-script-placeholder"": ""Mã JavaScript bổ sung"", - ""disable-public-memos"": ""Vô hiệu hóa ghi chú công khai"", - ""display-with-updated-time"": ""Display with updated time"" + ""amount-text"": { + ""memo_other"": ""GHI CHÚ"" }, - ""storage"": ""Kho lưu trữ"", - ""sso"": ""SSO"", - ""storage-section"": { - ""storage-services-list"": ""Danh sách dịch vụ kho lưu trữ"", - ""create-a-service"": ""Thêm dịch vụ kho lưu trữ"", - ""update-a-service"": ""Cập nhật dịch vụ kho lưu trữ"", - ""warning-text"": ""Bạn có chắc chắn xóa tài nguyên này không? HÀNH ĐỘNG NÀY KHÔNG THỂ KHÔI PHỤC❗"", - ""delete-storage"": ""Xóa kho lưu trữ"" + ""message"": { + ""memos-ready"": ""Tất cả ghi chú ở đây rồi 🎉"", + ""restored-successfully"": ""Đã khôi phục thành công"", + ""memo-updated-datetime"": ""Ghi chú đã thay đổi ngày giờ tạo."", + ""invalid-created-datetime"": ""Ngày giờ tạo không hợp lệ."", + ""change-memo-created-time"": ""Thay đổi thời gian tạo ghi chú"", + ""memo-not-found"": ""Không tìm thấy ghi chú."", + ""fill-all"": ""Vui lòng nhập tất cả các mục."", + ""new-password-not-match"": ""Mật khẩu mới không trung khớp."", + ""image-load-failed"": ""Tải ảnh bị lỗi"", + ""fill-form"": ""Hãy điền đầy đủ nội dung của biểu mẫu"", + ""login-failed"": ""Đăng nhập thất bại"", + ""signup-failed"": ""Đăng ký thất bại"", + ""user-not-found"": ""Không tìm thấy người dùng này"", + ""password-not-match"": ""Mật khẩu không trùng khớp."", + ""password-changed"": ""Mật khẩu đã được thay đổi"", + ""private-only"": ""Ghi chú này có trạng thái riêng tư."", + ""copied"": ""Đã sao chép"", + ""succeed-copy-content"": ""Đã sao chép nội dung ghi chú thành công."", + ""succeed-copy-link"": ""Đã sao chép liên kết thành công."", + ""change-resource-filename"": ""Thay đổi tên tệp tài nguyên"", + ""resource-filename-updated"": ""Tên tệp tài nguyên đã thay đổi."", + ""invalid-resource-filename"": ""Tên tệp không hợp lệ."", + ""click-to-save-the-image"": ""Bấm để lưu hình ảnh"", + ""generating-the-screenshot"": ""Đang tạo ảnh chụp màn hình ..."", + ""count-selected-resources"": ""Tổng đã chọn"", + ""succeed-vacuum-database"": ""Đã dọn dẹp cơ sở dữ liệu thành công"", + ""succeed-update-additional-style"": ""Đã cập nhật phong cách bổ sung thành công"", + ""succeed-copy-resource-link"": ""Đã sao chép liên kết tài nguyên"", + ""succeed-update-customized-profile"": ""Đã cập nhật hồ sơ tùy chỉnh"", + ""succeed-update-additional-script"": ""Đã cập nhật mã lệnh bổ sung thành công"", + ""update-succeed"": ""Đã cập nhật thành công"", + ""succeed-copy-code"": ""Đã sao chép mã thành công"", + ""page-not-found"": ""404 - Trang không tìm thấy 😥"" }, - ""appearance-option"": { - ""system"": ""Theo hệ thống"", - ""light"": ""Always light"", - ""dark"": ""Always dark"" + ""days"": { + ""mon"": ""T2"", + ""tue"": ""T3"", + ""wed"": ""T4"", + ""thu"": ""T5"", + ""fri"": ""T6"", + ""sat"": ""T7"", + ""sun"": ""CN"" } - }, - ""amount-text"": { - ""memo_other"": ""GHI CHÚ"", - ""tag_other"": ""THẺ"", - ""day_other"": ""NGÀY"", - ""memo_one"": ""MEMO"", - ""tag_one"": ""TAG"", - ""day_one"": ""DAY"" - }, - ""message"": { - ""no-memos"": ""Không có ghi chú nào 🌃"", - ""memos-ready"": ""Tất cả ghi chú ở đây rồi 🎉"", - ""restored-successfully"": ""Đã khôi phục thành công"", - ""memo-updated-datetime"": ""Ghi chú đã thay đổi ngày giờ tạo."", - ""invalid-created-datetime"": ""Ngày giờ tạo không hợp lệ."", - ""change-memo-created-time"": ""Thay đổi thời gian tạo ghi chú"", - ""memo-not-found"": ""Không tìm thấy ghi chú."", - ""fill-all"": ""Vui lòng nhập tất cả các mục."", - ""new-password-not-match"": ""Mật khẩu mới không trung khớp."", - ""image-load-failed"": ""Tải ảnh bị lỗi"", - ""fill-form"": ""Hãy điền đầy đủ nội dung của biểu mẫu"", - ""login-failed"": ""Đăng nhập thất bại"", - ""signup-failed"": ""Đăng ký thất bại"", - ""user-not-found"": ""Không tìm thấy người dùng này"", - ""password-not-match"": ""Mật khẩu không trùng khớp."", - ""password-changed"": ""Mật khẩu đã được thay đổi"", - ""private-only"": ""Ghi chú này có trạng thái riêng tư."", - ""copied"": ""Đã sao chép"", - ""succeed-copy-content"": ""Đã sao chép nội dung ghi chú thành công."", - ""succeed-copy-link"": ""Đã sao chép liên kết thành công."", - ""change-resource-filename"": ""Thay đổi tên tệp tài nguyên"", - ""resource-filename-updated"": ""Tên tệp tài nguyên đã thay đổi."", - ""invalid-resource-filename"": ""Tên tệp không hợp lệ."", - ""click-to-save-the-image"": ""Bấm để lưu hình ảnh"", - ""generating-the-screenshot"": ""Đang tạo ảnh chụp màn hình ..."", - ""count-selected-resources"": ""Tổng đã chọn"", - ""too-short"": ""Quá ngắn"", - ""too-long"": ""Quá dài"", - ""not-allow-space"": ""Không cho phép khoảng trống"", - ""not-allow-chinese"": ""Không sử dụng tiếng Trung Quốc"", - ""succeed-vacuum-database"": ""Đã dọn dẹp cơ sở dữ liệu thành công"", - ""succeed-update-additional-style"": ""Đã cập nhật phong cách bổ sung thành công"", - ""succeed-copy-resource-link"": ""Đã sao chép liên kết tài nguyên"", - ""succeed-update-customized-profile"": ""Đã cập nhật hồ sơ tùy chỉnh"", - ""succeed-update-additional-script"": ""Đã cập nhật mã lệnh bổ sung thành công"", - ""update-succeed"": ""Đã cập nhật thành công"", - ""succeed-copy-code"": ""Đã sao chép mã thành công"", - ""page-not-found"": ""404 - Trang không tìm thấy 😥"" - }, - ""days"": { - ""monday"": ""Thứ hai"", - ""mon"": ""T2"", - ""tuesday"": ""Thứ ba"", - ""tue"": ""T3"", - ""wednesday"": ""Thứ tư"", - ""wed"": ""T4"", - ""thursday"": ""Thứ năm"", - ""thu"": ""T5"", - ""friday"": ""Thứ sáu"", - ""fri"": ""T6"", - ""saturday"": ""Thứ bảy"", - ""sat"": ""T7"", - ""sunday"": ""Chủ nhật"", - ""sun"": ""CN"" - } } diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json index ab014eca01a20..3945ff4140417 100644 --- a/web/src/locales/zh-Hans.json +++ b/web/src/locales/zh-Hans.json @@ -1,443 +1,361 @@ { - ""common"": { - ""about"": ""关于"", - ""admin"": ""管理"", - ""archive"": ""归档"", - ""archived"": ""归档"", - ""archived-at"": ""归档于"", - ""avatar"": ""头像"", - ""back-to-home"": ""回到主页"", - ""basic"": ""基础"", - ""beta"": ""Beta"", - ""cancel"": ""取消"", - ""change"": ""修改"", - ""changed"": ""已更改"", - ""clear"": ""清除"", - ""close"": ""关闭"", - ""confirm"": ""确定"", - ""create"": ""创建"", - ""daily-review"": ""每日回顾"", - ""database"": ""数据库"", - ""delete"": ""删除"", - ""edit"": ""编辑"", - ""email"": ""邮箱"", - ""expand"": ""展开"", - ""explore"": ""探索"", - ""filter"": ""过滤器"", - ""filter-period"": ""{{from}}到{{to}}"", - ""fold"": ""折叠"", - ""home"": ""主页"", - ""image"": ""图片"", - ""language"": ""语言"", - ""learn-more"": ""了解更多"", - ""link"": ""链接"", - ""memos-slogan"": ""一个轻量级的自托管备忘录中心。开源且永远免费。"", - ""name"": ""名称"", - ""new-password"": ""新密码"", - ""nickname"": ""昵称"", - ""null"": ""空"", - ""or"": ""或者"", - ""password"": ""密码"", - ""pin"": ""置顶"", - ""preview"": ""预览"", - ""rename"": ""改名"", - ""repeat-new-password"": ""重复新密码"", - ""reset"": ""重置"", - ""resources"": ""资源库"", - ""restore"": ""恢复"", - ""save"": ""保存"", - ""select"": ""选择"", - ""settings"": ""设置"", - ""share"": ""分享"", - ""sign-in"": ""登录"", - ""sign-in-with"": ""使用{{provider}}登录"", - ""sign-out"": ""注销"", - ""sign-up"": ""注册"", - ""tags"": ""全部标签"", - ""title"": ""标题"", - ""type"": ""类型"", - ""unpin"": ""取消置顶"", - ""update"": ""更新"", - ""update-on"": ""更新于"", - ""upload"": ""上传"", - ""username"": ""用户名"", - ""vacuum"": ""清理未使用资源"", - ""version"": ""版本"", - ""visibility"": ""可见性"", - ""yourself"": ""你自己"", - ""new"": ""新建"", - ""dialog"": { - ""help"": ""帮助"", - ""info"": ""信息"", - ""error"": ""错误"", - ""warning"": ""警告"", - ""success"": ""成功"" + ""common"": { + ""about"": ""关于"", + ""admin"": ""管理"", + ""archive"": ""归档"", + ""archived"": ""归档"", + ""avatar"": ""头像"", + ""basic"": ""基础"", + ""beta"": ""Beta"", + ""cancel"": ""取消"", + ""change"": ""修改"", + ""changed"": ""已更改"", + ""clear"": ""清除"", + ""close"": ""关闭"", + ""confirm"": ""确定"", + ""create"": ""创建"", + ""database"": ""数据库"", + ""delete"": ""删除"", + ""edit"": ""编辑"", + ""email"": ""邮箱"", + ""expand"": ""展开"", + ""explore"": ""探索"", + ""filter"": ""过滤器"", + ""filter-period"": ""{{from}}到{{to}}"", + ""fold"": ""折叠"", + ""home"": ""主页"", + ""image"": ""图片"", + ""language"": ""语言"", + ""learn-more"": ""了解更多"", + ""link"": ""链接"", + ""name"": ""名称"", + ""nickname"": ""昵称"", + ""null"": ""空"", + ""or"": ""或者"", + ""password"": ""密码"", + ""pin"": ""置顶"", + ""preview"": ""预览"", + ""rename"": ""改名"", + ""reset"": ""重置"", + ""resources"": ""资源库"", + ""restore"": ""恢复"", + ""save"": ""保存"", + ""select"": ""选择"", + ""settings"": ""设置"", + ""share"": ""分享"", + ""sign-in"": ""登录"", + ""sign-in-with"": ""使用{{provider}}登录"", + ""sign-out"": ""注销"", + ""sign-up"": ""注册"", + ""tags"": ""全部标签"", + ""title"": ""标题"", + ""type"": ""类型"", + ""unpin"": ""取消置顶"", + ""update"": ""更新"", + ""upload"": ""上传"", + ""username"": ""用户名"", + ""vacuum"": ""清理未使用资源"", + ""version"": ""版本"", + ""visibility"": ""可见性"", + ""yourself"": ""你自己"", + ""new"": ""新建"", + ""mark"": ""引用"" }, - ""mark"": ""引用"" - }, - ""about"": { - ""about-memos"": ""关于Memos"", - ""memos-description"": ""Memos是一个基于网页的笔记应用程序，您可以使用它来编写、组织和共享笔记"", - ""no-server-description"": ""没有为此服务器配置描述。"", - ""other-projects"": ""其他的项目"", - ""powered-by"": ""Powered by"" - }, - ""amount-text"": { - ""day_one"": ""DAY"", - ""day_other"": ""DAYS"", - ""memo_one"": ""MEMO"", - ""memo_other"": ""MEMOS"", - ""tag_one"": ""TAG"", - ""tag_other"": ""TAGS"" - }, - ""archived"": { - ""archived-memos"": ""已归档的备忘录"", - ""fetching-data"": ""请求数据中..."", - ""no-archived-memos"": ""没有归档的备忘录"" - }, - ""auth"": { - ""host-tip"": ""你正在注册为管理员用户账号。"", - ""new-password"": ""新密码"", - ""not-host-tip"": ""如果你没有账号，请联系站点管理员"", - ""repeat-new-password"": ""重复新密码"", - ""signup-as-host"": ""注册为管理员"" - }, - ""daily-review"": { - ""no-memos"": ""哎呀，空无一物。"", - ""title"": ""每日回顾"" - }, - ""days"": { - ""fri"": ""五"", - ""friday"": ""星期五"", - ""mon"": ""一"", - ""monday"": ""星期一"", - ""sat"": ""六"", - ""saturday"": ""星期六"", - ""sun"": ""日"", - ""sunday"": ""星期天"", - ""thu"": ""四"", - ""thursday"": ""星期四"", - ""tue"": ""二"", - ""tuesday"": ""星期二"", - ""wed"": ""三"", - ""wednesday"": ""星期三"" - }, - ""editor"": { - ""cancel-edit"": ""取消编辑"", - ""cant-empty"": ""内容不能为空"", - ""editing"": ""编辑中..."", - ""local"": ""本地"", - ""only-image-supported"": ""仅支持图片文件。"", - ""placeholder"": ""任何想法..."", - ""resources"": ""资源库"", - ""save"": ""保存"" - }, - ""embed-memo"": { - ""copy"": ""复制"", - ""only-public-supported"": ""* 仅支持公开备忘录。"", - ""text"": ""将以下代码复制并粘贴到您的博客或网站中。"", - ""title"": ""嵌入备忘录"" - }, - ""filter"": { - ""and"": ""且"", - ""new-filter"": ""新建过滤器"", - ""operator"": { - ""after"": ""晚于"", - ""before"": ""早于"", - ""contains"": ""包含"", - ""is"": ""是"", - ""is-not"": ""不是"", - ""not-contains"": ""不包含"" + ""about"": { + ""about-memos"": ""关于Memos"", + ""memos-description"": ""Memos是一个基于网页的笔记应用程序，您可以使用它来编写、组织和共享笔记"", + ""no-server-description"": ""没有为此服务器配置描述。"", + ""other-projects"": ""其他的项目"", + ""powered-by"": ""Powered by"" }, - ""or"": ""或"", - ""text-placeholder"": ""以 ^ 开头使用正则表达式"", - ""type"": { - ""display-time"": ""显示时间"", - ""tag"": ""标签"", - ""text"": ""文本"", - ""type"": ""类型"", - ""visibility"": ""可见性"" + ""amount-text"": { + ""memo_other"": ""MEMOS"" }, - ""value"": { - ""has-attachment"": ""包含附件"", - ""linked"": ""包含链接"", - ""not-tagged"": ""无标签"" - } - }, - ""heatmap"": { - ""day"": ""天中"", - ""days"": ""天中"", - ""memo-in"": "" 条备忘录，在过去的"", - ""memos-in"": "" 条备忘录，在过去的"", - ""memo-on"": ""{{date}} 记了 {{amount}} 条备忘录"", - ""memos-on"": ""{{date}} 记了 {{amount}} 条备忘录"" - }, - ""memo"": { - ""archived-at"": ""存档于"", - ""archived-memos"": ""归档备忘录"", - ""copy"": ""复制"", - ""copy-link"": ""复制链接"", - ""delete-confirm"": ""您确定要删除此备忘录吗？\n\n此操作不可逆❗"", - ""delete-memo"": ""删除备忘录"", - ""embed"": ""嵌入"", - ""fetch-more"": ""点击此处获取更多"", - ""fetching-data"": ""正在获取数据..."", - ""no-archived-memos"": ""无存档的备忘录。"", - ""search-placeholder"": ""搜索备忘录"", - ""view-detail"": ""查看详情"", - ""visibility"": { - ""disabled"": ""公共备忘录已禁用"", - ""private"": ""仅自己可见"", - ""protected"": ""登录用户可见"", - ""public"": ""所有人可见"" - } - }, - ""memo-list"": { - ""fetch-more"": ""点击加载更多"", - ""fetching-data"": ""请求数据中..."" - }, - ""message"": { - ""change-memo-created-time"": ""更改备忘录创建时间"", - ""change-memo-created-time-warning-1"": ""这不是正常行为。"", - ""change-memo-created-time-warning-2"": ""请确定你真的需要这么做。"", - ""change-resource-filename"": ""更改资源文件名"", - ""click-to-save-the-image"": ""点击保存图片"", - ""copied"": ""已复制"", - ""count-selected-resources"": ""所选资源总数"", - ""fill-all"": ""请填写所有栏目。"", - ""fill-form"": ""请填写此表单"", - ""fill-server-name"": ""请填写服务器名称"", - ""generating-the-screenshot"": ""正在生成截图..."", - ""image-load-failed"": ""图片加载失败"", - ""invalid-created-datetime"": ""创建的日期时间无效。"", - ""invalid-resource-filename"": ""无效的资源文件名"", - ""login-failed"": ""登录失败"", - ""memo-not-found"": ""找不到备忘录。"", - ""memo-updated-datetime"": ""备忘录创建日期时间已更改。"", - ""memos-ready"": ""所有备忘录已就绪 🎉"", - ""new-password-not-match"": ""新密码不匹配。"", - ""no-data"": ""也许寻觅无果，也许可重新设定标准。"", - ""not-allow-chinese"": ""不允许包含中文"", - ""not-allow-space"": ""不允许包含空格"", - ""page-not-found"": ""404 - 未找到网页 😥"", - ""password-changed"": ""密码已修改"", - ""password-not-match"": ""密码不一致。"", - ""private-only"": ""此备忘录仅自己可见"", - ""resource-filename-updated"": ""资源文件名更改成功。"", - ""resource-ready"": ""所有资源已就绪 🎉"", - ""restored-successfully"": ""恢复成功"", - ""signup-failed"": ""注册失败"", - ""succeed-copy-code"": ""复制代码到剪贴板成功。"", - ""succeed-copy-content"": ""复制内容到剪贴板成功。"", - ""succeed-copy-link"": ""复制链接到剪贴板成功。"", - ""succeed-copy-resource-link"": ""复制资源链接到剪贴板成功"", - ""succeed-update-additional-script"": ""更新附加脚本成功"", - ""succeed-update-additional-style"": ""更新附加样式成功"", - ""succeed-update-customized-profile"": ""更新自定义配置文件成功"", - ""succeed-vacuum-database"": ""清理数据库成功"", - ""too-long"": ""过长"", - ""too-short"": ""过短"", - ""update-succeed"": ""更新成功"", - ""user-not-found"": ""未找到该用户"", - ""maximum-upload-size-is"": ""允许的最大上传大小为 {{size}} MiB"", - ""file-exceeds-upload-limit-of"": ""文件 {{file}} 超出了 {{size}} MiB 的上传限制"" - }, - ""resource"": { - ""clear"": ""清除"", - ""copy-link"": ""复制链接"", - ""create-dialog"": { - ""external-link"": { - ""file-name"": ""文件名"", - ""file-name-placeholder"": ""文件名"", - ""link"": ""链接"", - ""link-placeholder"": ""https://the.link.to/your/resource"", - ""option"": ""外部链接"", - ""type"": ""类型"", - ""type-placeholder"": ""文件类型"" - }, - ""local-file"": { - ""choose"": ""选择文件..."", - ""option"": ""本地文件"" - }, - ""title"": ""创建资源"", - ""upload-method"": ""上传方式"" + ""auth"": { + ""host-tip"": ""你正在注册为管理员用户账号。"", + ""new-password"": ""新密码"", + ""repeat-new-password"": ""重复新密码"" + }, + ""daily-review"": { + ""no-memos"": ""哎呀，空无一物。"", + ""title"": ""每日回顾"" + }, + ""days"": { + ""fri"": ""五"", + ""mon"": ""一"", + ""sat"": ""六"", + ""sun"": ""日"", + ""thu"": ""四"", + ""tue"": ""二"", + ""wed"": ""三"" + }, + ""editor"": { + ""cancel-edit"": ""取消编辑"", + ""cant-empty"": ""内容不能为空"", + ""editing"": ""编辑中..."", + ""local"": ""本地"", + ""only-image-supported"": ""仅支持图片文件。"", + ""placeholder"": ""任何想法..."", + ""resources"": ""资源库"", + ""save"": ""保存"" + }, + ""embed-memo"": { + ""copy"": ""复制"", + ""only-public-supported"": ""* 仅支持公开备忘录。"", + ""text"": ""将以下代码复制并粘贴到您的博客或网站中。"", + ""title"": ""嵌入备忘录"" }, - ""delete-resource"": ""删除资源"", - ""delete-selected-resources"": ""删除选中资源"", - ""description"": ""查看在备忘录中的静态资源。例如：图片"", - ""fetching-data"": ""请求数据中..."", - ""file-drag-drop-prompt"": ""将您的文件拖放到此处以上传文件"", - ""linked-amount"": ""链接的备忘录数量"", - ""name"": ""资源名称"", - ""no-files-selected"": ""没有文件被选中❗"", - ""no-resources"": ""没有资源"", - ""no-unused-resources"": ""无可删除的资源"", - ""preview"": ""预览"", - ""rename"": ""重命名"", - ""reset-link"": ""重置链接"", - ""reset-link-prompt"": ""您确定要重置链接吗？\n这将打破所有当前的链接用法。\n\n此操作不可逆❗"", - ""reset-resource-link"": ""重置资源链接"", - ""search-bar-placeholder"": ""搜索资源"", - ""select"": ""选择"", - ""upload"": ""上传"", - ""upload-successfully"": ""上传成功"", - ""warning-text"": ""确定删除这个资源么？\n\n此操作不可逆❗"", - ""warning-text-unused"": ""确定删除这些无用资源么？\n\n此操作不可逆❗"" - }, - ""router"": { - ""go-to-home"": ""回到首页"" - }, - ""search"": { - ""quickly-filter"": ""快速过滤"" - }, - ""setting"": { - ""account-section"": { - ""change-password"": ""修改密码"", - ""email-note"": ""可选"", - ""nickname-note"": ""显示在横幅中"", - ""openapi-reset"": ""重置 OpenAPI 密钥"", - ""openapi-reset-warning"": ""❗现有的API将失效并生成一个新的API。\n\n您确定要重置吗？"", - ""openapi-sample-post"": ""你好 #memos 来自 {{url}}"", - ""openapi-title"": ""OpenAPI"", - ""reset-api"": ""重置API"", - ""title"": ""账号信息"", - ""update-information"": ""更新个人信息"", - ""username-note"": ""用于登录"" + ""heatmap"": { + ""day"": ""天中"", + ""days"": ""天中"", + ""memo-in"": "" 条备忘录，在过去的"", + ""memos-in"": "" 条备忘录，在过去的"", + ""memo-on"": ""{{date}} 记了 {{amount}} 条备忘录"", + ""memos-on"": ""{{date}} 记了 {{amount}} 条备忘录"" }, - ""appearance-option"": { - ""dark"": ""总是深色"", - ""light"": ""总是浅色"", - ""system"": ""跟随系统"" + ""memo"": { + ""archived-at"": ""存档于"", + ""archived-memos"": ""归档备忘录"", + ""copy-link"": ""复制链接"", + ""delete-confirm"": ""您确定要删除此备忘录吗？\n\n此操作不可逆❗"", + ""delete-memo"": ""删除备忘录"", + ""embed"": ""嵌入"", + ""fetch-more"": ""点击此处获取更多"", + ""fetching-data"": ""正在获取数据..."", + ""no-archived-memos"": ""无存档的备忘录。"", + ""search-placeholder"": ""搜索备忘录"", + ""view-detail"": ""查看详情"", + ""visibility"": { + ""disabled"": ""公共备忘录已禁用"", + ""private"": ""仅自己可见"", + ""protected"": ""登录用户可见"", + ""public"": ""所有人可见"" + } }, - ""member"": ""成员"", - ""member-list"": ""成员列表"", - ""member-section"": { - ""archive-member"": ""归档成员"", - ""archive-warning"": ""❗您确定要归档 {{username}} 吗？"", - ""create-a-member"": ""创建成员"", - ""delete-member"": ""删除成员"", - ""delete-warning"": ""❗您确定要删除 {{username}} 吗？\n\n此操作不可逆❗"" + ""message"": { + ""change-memo-created-time"": ""更改备忘录创建时间"", + ""change-memo-created-time-warning-1"": ""这不是正常行为。"", + ""change-memo-created-time-warning-2"": ""请确定你真的需要这么做。"", + ""change-resource-filename"": ""更改资源文件名"", + ""click-to-save-the-image"": ""点击保存图片"", + ""copied"": ""已复制"", + ""count-selected-resources"": ""所选资源总数"", + ""fill-all"": ""请填写所有栏目。"", + ""fill-form"": ""请填写此表单"", + ""fill-server-name"": ""请填写服务器名称"", + ""generating-the-screenshot"": ""正在生成截图..."", + ""image-load-failed"": ""图片加载失败"", + ""invalid-created-datetime"": ""创建的日期时间无效。"", + ""invalid-resource-filename"": ""无效的资源文件名"", + ""login-failed"": ""登录失败"", + ""memo-not-found"": ""找不到备忘录。"", + ""memo-updated-datetime"": ""备忘录创建日期时间已更改。"", + ""memos-ready"": ""所有备忘录已就绪 🎉"", + ""new-password-not-match"": ""新密码不匹配。"", + ""no-data"": ""也许寻觅无果，也许可重新设定标准。"", + ""page-not-found"": ""404 - 未找到网页 😥"", + ""password-changed"": ""密码已修改"", + ""password-not-match"": ""密码不一致。"", + ""private-only"": ""此备忘录仅自己可见"", + ""resource-filename-updated"": ""资源文件名更改成功。"", + ""resource-ready"": ""所有资源已就绪 🎉"", + ""restored-successfully"": ""恢复成功"", + ""signup-failed"": ""注册失败"", + ""succeed-copy-code"": ""复制代码到剪贴板成功。"", + ""succeed-copy-content"": ""复制内容到剪贴板成功。"", + ""succeed-copy-link"": ""复制链接到剪贴板成功。"", + ""succeed-copy-resource-link"": ""复制资源链接到剪贴板成功"", + ""succeed-update-additional-script"": ""更新附加脚本成功"", + ""succeed-update-additional-style"": ""更新附加样式成功"", + ""succeed-update-customized-profile"": ""更新自定义配置文件成功"", + ""succeed-vacuum-database"": ""清理数据库成功"", + ""update-succeed"": ""更新成功"", + ""user-not-found"": ""未找到该用户"", + ""maximum-upload-size-is"": ""允许的最大上传大小为 {{size}} MiB"", + ""file-exceeds-upload-limit-of"": ""文件 {{file}} 超出了 {{size}} MiB 的上传限制"" }, - ""my-account"": ""我的账号"", - ""preference"": ""偏好设置"", - ""preference-section"": { - ""auto-collapse"": ""自动折叠"", - ""created_ts"": ""创建时间"", - ""daily-review-time-offset"": ""每日回顾时间偏移"", - ""default-memo-sort-option"": ""备忘录显示时间"", - ""default-memo-visibility"": ""默认备忘录可见性"", - ""editor-font-style"": ""编辑器字体样式"", - ""enable-double-click"": ""开启双击编辑"", - ""enable-folding-memo"": ""开启折叠备忘录"", - ""mobile-editor-style"": ""移动端编辑器样式"", - ""telegram-user-id"": ""Telegram UserID"", - ""telegram-user-id-placeholder"": ""向Telegram机器人发送任意消息以获取"", - ""theme"": ""主题"", - ""updated_ts"": ""更新时间"", - ""default-resource-visibility"": ""默认资源可见性"" + ""resource"": { + ""clear"": ""清除"", + ""copy-link"": ""复制链接"", + ""create-dialog"": { + ""external-link"": { + ""file-name"": ""文件名"", + ""file-name-placeholder"": ""文件名"", + ""link"": ""链接"", + ""link-placeholder"": ""https://the.link.to/your/resource"", + ""option"": ""外部链接"", + ""type"": ""类型"", + ""type-placeholder"": ""文件类型"" + }, + ""local-file"": { + ""choose"": ""选择文件..."", + ""option"": ""本地文件"" + }, + ""title"": ""创建资源"", + ""upload-method"": ""上传方式"" + }, + ""delete-resource"": ""删除资源"", + ""delete-selected-resources"": ""删除选中资源"", + ""fetching-data"": ""请求数据中..."", + ""file-drag-drop-prompt"": ""将您的文件拖放到此处以上传文件"", + ""linked-amount"": ""链接的备忘录数量"", + ""no-files-selected"": ""没有文件被选中❗"", + ""no-resources"": ""没有资源"", + ""no-unused-resources"": ""无可删除的资源"", + ""reset-link"": ""重置链接"", + ""reset-link-prompt"": ""您确定要重置链接吗？\n这将打破所有当前的链接用法。\n\n此操作不可逆❗"", + ""reset-resource-link"": ""重置资源链接"", + ""search-bar-placeholder"": ""搜索资源"", + ""upload-successfully"": ""上传成功"", + ""warning-text"": ""确定删除这个资源么？\n\n此操作不可逆❗"", + ""warning-text-unused"": ""确定删除这些无用资源么？\n\n此操作不可逆❗"" }, - ""sso"": ""SSO"", - ""sso-section"": { - ""authorization-endpoint"": ""授权端点（Authorization Endpoint）"", - ""client-id"": ""客户端ID（Client ID）"", - ""client-secret"": ""客户端密钥（Client Secret）"", - ""confirm-delete"": ""您确定要删除“{{name}}”单点登录配置吗？\n\n此操作不可逆❗"", - ""create-sso"": ""创建单点登录"", - ""custom"": ""自定义"", - ""delete-sso"": ""确认删除"", - ""display-name"": ""显示名称"", - ""identifier"": ""标识符（Identifier）"", - ""identifier-filter"": ""标识符过滤器（Identifier Filter）"", - ""redirect-url"": ""重定向 URL"", - ""scopes"": ""范围"", - ""sso-created"": ""单点登录 {{name}} 已创建"", - ""sso-list"": ""单点登录列表"", - ""sso-updated"": ""单点登录 {{name}} 已更新"", - ""template"": ""模板"", - ""token-endpoint"": ""令牌端点（Token Endpoint）"", - ""update-sso"": ""更新单点登录"", - ""user-endpoint"": ""用户端点（User Endpoint）"" + ""router"": { + ""go-to-home"": ""回到首页"" }, - ""storage"": ""存储设置"", - ""storage-section"": { - ""accesskey"": ""访问密钥（Access key）"", - ""accesskey-placeholder"": ""Access key / Access ID"", - ""bucket"": ""储存桶（Bucket）"", - ""bucket-placeholder"": ""储存桶名"", - ""create-a-service"": ""新建服务"", - ""create-storage"": ""创建存储"", - ""current-storage"": ""当前存储"", - ""delete-storage"": ""删除存储服务"", - ""endpoint"": ""端点（Endpoint）"", - ""local-storage-path"": ""本地存储路径"", - ""path"": ""存储路径"", - ""path-description"": ""您可以使用本地存储中的相同动态变量，例如 {filename}"", - ""path-placeholder"": ""自定义路径"", - ""region"": ""地区"", - ""region-placeholder"": ""区域名称"", - ""s3-compatible-url"": ""S3 兼容 URL"", - ""secretkey"": ""Secret key"", - ""secretkey-placeholder"": ""Secret key / Access Key"", - ""storage-services-list"": ""存储服务列表"", - ""type-database"": ""数据库"", - ""type-local"": ""本地存储"", - ""update-a-service"": ""更新服务"", - ""update-local-path"": ""更新本地存储路径"", - ""update-local-path-description"": ""本地存储路径是数据库文件的相对路径"", - ""update-storage"": ""更新存储"", - ""url-prefix"": ""URL 前缀"", - ""url-prefix-placeholder"": ""自定义 URL 前缀，可选"", - ""url-suffix"": ""URL 后缀"", - ""url-suffix-placeholder"": ""自定义 URL 后缀，可选"", - ""warning-text"": ""确定删除这个存储服务“{{name}}”么？\n\n此操作不可逆❗"" + ""setting"": { + ""account-section"": { + ""change-password"": ""修改密码"", + ""email-note"": ""可选"", + ""nickname-note"": ""显示在横幅中"", + ""openapi-reset"": ""重置 OpenAPI 密钥"", + ""openapi-reset-warning"": ""❗现有的API将失效并生成一个新的API。\n\n您确定要重置吗？"", + ""openapi-sample-post"": ""你好 #memos 来自 {{url}}"", + ""openapi-title"": ""OpenAPI"", + ""reset-api"": ""重置API"", + ""title"": ""账号信息"", + ""update-information"": ""更新个人信息"", + ""username-note"": ""用于登录"" + }, + ""appearance-option"": { + ""dark"": ""总是深色"", + ""light"": ""总是浅色"", + ""system"": ""跟随系统"" + }, + ""member"": ""成员"", + ""member-list"": ""成员列表"", + ""member-section"": { + ""archive-member"": ""归档成员"", + ""archive-warning"": ""❗您确定要归档 {{username}} 吗？"", + ""create-a-member"": ""创建成员"", + ""delete-member"": ""删除成员"", + ""delete-warning"": ""❗您确定要删除 {{username}} 吗？\n\n此操作不可逆❗"" + }, + ""my-account"": ""我的账号"", + ""preference"": ""偏好设置"", + ""preference-section"": { + ""auto-collapse"": ""自动折叠"", + ""created_ts"": ""创建时间"", + ""daily-review-time-offset"": ""每日回顾时间偏移"", + ""default-memo-sort-option"": ""备忘录显示时间"", + ""default-memo-visibility"": ""默认备忘录可见性"", + ""editor-font-style"": ""编辑器字体样式"", + ""enable-double-click"": ""开启双击编辑"", + ""enable-folding-memo"": ""开启折叠备忘录"", + ""mobile-editor-style"": ""移动端编辑器样式"", + ""telegram-user-id"": ""Telegram UserID"", + ""telegram-user-id-placeholder"": ""向Telegram机器人发送任意消息以获取"", + ""theme"": ""主题"", + ""updated_ts"": ""更新时间"", + ""default-resource-visibility"": ""默认资源可见性"" + }, + ""sso"": ""SSO"", + ""sso-section"": { + ""authorization-endpoint"": ""授权端点（Authorization Endpoint）"", + ""client-id"": ""客户端ID（Client ID）"", + ""client-secret"": ""客户端密钥（Client Secret）"", + ""confirm-delete"": ""您确定要删除“{{name}}”单点登录配置吗？\n\n此操作不可逆❗"", + ""create-sso"": ""创建单点登录"", + ""custom"": ""自定义"", + ""delete-sso"": ""确认删除"", + ""display-name"": ""显示名称"", + ""identifier"": ""标识符（Identifier）"", + ""identifier-filter"": ""标识符过滤器（Identifier Filter）"", + ""redirect-url"": ""重定向 URL"", + ""scopes"": ""范围"", + ""sso-created"": ""单点登录 {{name}} 已创建"", + ""sso-list"": ""单点登录列表"", + ""sso-updated"": ""单点登录 {{name}} 已更新"", + ""template"": ""模板"", + ""token-endpoint"": ""令牌端点（Token Endpoint）"", + ""update-sso"": ""更新单点登录"", + ""user-endpoint"": ""用户端点（User Endpoint）"" + }, + ""storage"": ""存储设置"", + ""storage-section"": { + ""accesskey"": ""访问密钥（Access key）"", + ""accesskey-placeholder"": ""Access key / Access ID"", + ""bucket"": ""储存桶（Bucket）"", + ""bucket-placeholder"": ""储存桶名"", + ""create-a-service"": ""新建服务"", + ""create-storage"": ""创建存储"", + ""current-storage"": ""当前存储"", + ""delete-storage"": ""删除存储服务"", + ""endpoint"": ""端点（Endpoint）"", + ""local-storage-path"": ""本地存储路径"", + ""path"": ""存储路径"", + ""path-description"": ""您可以使用本地存储中的相同动态变量，例如 {filename}"", + ""path-placeholder"": ""自定义路径"", + ""region"": ""地区"", + ""region-placeholder"": ""区域名称"", + ""s3-compatible-url"": ""S3 兼容 URL"", + ""secretkey"": ""Secret key"", + ""secretkey-placeholder"": ""Secret key / Access Key"", + ""storage-services-list"": ""存储服务列表"", + ""type-database"": ""数据库"", + ""type-local"": ""本地存储"", + ""update-a-service"": ""更新服务"", + ""update-local-path"": ""更新本地存储路径"", + ""update-local-path-description"": ""本地存储路径是数据库文件的相对路径"", + ""update-storage"": ""更新存储"", + ""url-prefix"": ""URL 前缀"", + ""url-prefix-placeholder"": ""自定义 URL 前缀，可选"", + ""url-suffix"": ""URL 后缀"", + ""url-suffix-placeholder"": ""自定义 URL 后缀，可选"", + ""warning-text"": ""确定删除这个存储服务“{{name}}”么？\n\n此操作不可逆❗"" + }, + ""system"": ""系统"", + ""system-section"": { + ""additional-script"": ""自定义脚本"", + ""additional-script-placeholder"": ""自定义 JavaScript 代码"", + ""additional-style"": ""自定义样式"", + ""additional-style-placeholder"": ""自定义 CSS 代码"", + ""allow-user-signup"": ""允许用户注册"", + ""customize-server"": { + ""appearance"": ""服务器外观"", + ""default"": ""默认为 memos"", + ""description"": ""描述"", + ""icon-url"": ""图标 URL"", + ""locale"": ""服务器语言环境"", + ""title"": ""自定义服务"" + }, + ""database-file-size"": ""数据库文件大小"", + ""disable-password-login"": ""禁用密码登录"", + ""disable-password-login-warning"": ""所有用户将无法使用密码登录。如果配置的身份提供程序失效，不在数据库中恢复此设置将无法登录。删除身份提供程序时也要格外小心❗"", + ""disable-password-login-final-warning"": ""如果你知道自己在做什么，请输入 \""CONFIRM\"""", + ""enable-password-login"": ""启用密码登录"", + ""enable-password-login-warning"": ""启用所有用户的密码登录。如果希望用户同时使用 SSO 和密码登录，请开启密码登录"", + ""disable-public-memos"": ""禁用公共备忘录"", + ""ignore-version-upgrade"": ""忽略版本升级"", + ""telegram-bot-token"": ""Telegram 机器人 Token"", + ""telegram-bot-token-description"": ""Telegram 机器人Token或`http.../bot`格式的代理地址"", + ""telegram-bot-token-placeholder"": ""Telegram 的机器人 Token"", + ""server-name"": ""服务名称"", + ""max-upload-size-hint"": ""建议值为 32 MiB。"", + ""max-upload-size"": ""最大上传大小 (MiB)"", + ""auto-backup-interval"": ""自动备份间隔(单位：秒)"", + ""auto-backup-interval-hint"": ""设置为0禁止自动备份，重启后生效"", + ""display-with-updated-time"": ""显示最后修改时间"" + } }, - ""system"": ""系统"", - ""system-section"": { - ""additional-script"": ""自定义脚本"", - ""additional-script-placeholder"": ""自定义 JavaScript 代码"", - ""additional-style"": ""自定义样式"", - ""additional-style-placeholder"": ""自定义 CSS 代码"", - ""allow-user-signup"": ""允许用户注册"", - ""customize-server"": { - ""appearance"": ""服务器外观"", - ""default"": ""默认为 memos"", - ""description"": ""描述"", - ""icon-url"": ""图标 URL"", - ""locale"": ""服务器语言环境"", - ""title"": ""自定义服务"" - }, - ""database-file-size"": ""数据库文件大小"", - ""disable-password-login"": ""禁用密码登录"", - ""disable-password-login-warning"": ""所有用户将无法使用密码登录。如果配置的身份提供程序失效，不在数据库中恢复此设置将无法登录。删除身份提供程序时也要格外小心❗"", - ""disable-password-login-final-warning"": ""如果你知道自己在做什么，请输入 \""CONFIRM\"""", - ""enable-password-login"": ""启用密码登录"", - ""enable-password-login-warning"": ""启用所有用户的密码登录。如果希望用户同时使用 SSO 和密码登录，请开启密码登录"", - ""disable-public-memos"": ""禁用公共备忘录"", - ""ignore-version-upgrade"": ""忽略版本升级"", - ""telegram-bot-token"": ""Telegram 机器人 Token"", - ""telegram-bot-token-description"": ""Telegram 机器人Token或`http.../bot`格式的代理地址"", - ""telegram-bot-token-placeholder"": ""Telegram 的机器人 Token"", - ""openai-api-host"": ""OpenAI：API Host"", - ""openai-api-host-placeholder"": ""默认：https://api.openai.com/"", - ""openai-api-key"": ""OpenAI：API 密钥"", - ""openai-api-key-description"": ""获取 API Key"", - ""openai-api-key-placeholder"": ""您的 OpenAI API Key"", - ""server-name"": ""服务名称"", - ""max-upload-size-hint"": ""建议值为 32 MiB。"", - ""max-upload-size"": ""最大上传大小 (MiB)"", - ""auto-backup-interval"": ""自动备份间隔(单位：秒)"", - ""auto-backup-interval-hint"": ""设置为0禁止自动备份，重启后生效"", - ""display-with-updated-time"": ""显示最后修改时间"" + ""tag-list"": { + ""all-tags"": ""全部标签"", + ""create-tag"": ""创建标签"", + ""tag-name"": ""标签名称"", + ""tip-text"": ""输入`#tag`来创建标签"", + ""tag-suggestions"": ""标签建议"", + ""show"": ""展开"", + ""hide"": ""收起"", + ""save-all"": ""全部保存"" } - }, - ""tag-list"": { - ""all-tags"": ""全部标签"", - ""create-tag"": ""创建标签"", - ""tag-name"": ""标签名称"", - ""tip-text"": ""输入`#tag`来创建标签"", - ""tag-suggestions"": ""标签建议"", - ""show"": ""展开"", - ""hide"": ""收起"", - ""save-all"": ""全部保存"" - } } diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index edeee6a5e5ac1..f158125248b15 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -1,401 +1,361 @@ { - ""common"": { - ""memos-slogan"": ""一個輕量、可自架的備忘錄中心。永遠開源且免費"", - ""about"": ""關於"", - ""home"": ""首頁"", - ""resources"": ""資源庫"", - ""settings"": ""設定"", - ""archived"": ""封存"", - ""email"": ""信箱"", - ""password"": ""密碼"", - ""avatar"": ""頭像"", - ""username"": ""帳號"", - ""nickname"": ""暱稱"", - ""save"": ""儲存"", - ""close"": ""關閉"", - ""cancel"": ""取消"", - ""create"": ""建立"", - ""update"": ""更新"", - ""change"": ""變更"", - ""confirm"": ""確認"", - ""reset"": ""重設"", - ""language"": ""語言"", - ""version"": ""版本"", - ""pin"": ""釘選"", - ""unpin"": ""解除釘選"", - ""edit"": ""編輯"", - ""restore"": ""還原"", - ""delete"": ""刪除"", - ""null"": ""空"", - ""share"": ""分享"", - ""archive"": ""封存"", - ""basic"": ""基礎"", - ""admin"": ""管理"", - ""explore"": ""探索"", - ""sign-in"": ""登入"", - ""sign-in-with"": ""使用 {{provider}} 登入"", - ""or"": ""或"", - ""sign-up"": ""註冊"", - ""sign-out"": ""登出"", - ""type"": ""類型"", - ""title"": ""標題"", - ""filter"": ""過濾器"", - ""filter-period"": ""{{from}} 至 {{to}}"", - ""tags"": ""標籤"", - ""yourself"": ""你自己"", - ""changed"": ""已變更"", - ""fold"": ""折疊"", - ""expand"": ""展開"", - ""image"": ""圖片"", - ""link"": ""連結"", - ""vacuum"": ""清理"", - ""select"": ""選擇"", - ""database"": ""資料庫"", - ""upload"": ""上傳"", - ""preview"": ""預覽"", - ""rename"": ""更名"", - ""clear"": ""清除"", - ""name"": ""名稱"", - ""visibility"": ""可見度"", - ""learn-more"": ""了解"", - ""beta"": ""測試版"", - ""new"": ""新增"", - ""dialog"": { - ""error"": ""錯誤"", - ""help"": ""幫助"", - ""info"": ""資訊"", - ""success"": ""成功"", - ""warning"": ""警告"" + ""common"": { + ""about"": ""關於"", + ""home"": ""首頁"", + ""resources"": ""資源庫"", + ""settings"": ""設定"", + ""archived"": ""封存"", + ""email"": ""信箱"", + ""password"": ""密碼"", + ""avatar"": ""頭像"", + ""username"": ""帳號"", + ""nickname"": ""暱稱"", + ""save"": ""儲存"", + ""close"": ""關閉"", + ""cancel"": ""取消"", + ""create"": ""建立"", + ""update"": ""更新"", + ""change"": ""變更"", + ""confirm"": ""確認"", + ""reset"": ""重設"", + ""language"": ""語言"", + ""version"": ""版本"", + ""pin"": ""釘選"", + ""unpin"": ""解除釘選"", + ""edit"": ""編輯"", + ""restore"": ""還原"", + ""delete"": ""刪除"", + ""null"": ""空"", + ""share"": ""分享"", + ""archive"": ""封存"", + ""basic"": ""基礎"", + ""admin"": ""管理"", + ""explore"": ""探索"", + ""sign-in"": ""登入"", + ""sign-in-with"": ""使用 {{provider}} 登入"", + ""or"": ""或"", + ""sign-up"": ""註冊"", + ""sign-out"": ""登出"", + ""type"": ""類型"", + ""title"": ""標題"", + ""filter"": ""過濾器"", + ""filter-period"": ""{{from}} 至 {{to}}"", + ""tags"": ""標籤"", + ""yourself"": ""你自己"", + ""changed"": ""已變更"", + ""fold"": ""折疊"", + ""expand"": ""展開"", + ""image"": ""圖片"", + ""link"": ""連結"", + ""vacuum"": ""清理"", + ""select"": ""選擇"", + ""database"": ""資料庫"", + ""upload"": ""上傳"", + ""preview"": ""預覽"", + ""rename"": ""更名"", + ""clear"": ""清除"", + ""name"": ""名稱"", + ""visibility"": ""可見度"", + ""learn-more"": ""了解"", + ""beta"": ""測試版"", + ""new"": ""新增"", + ""mark"": ""Mark"" }, - ""mark"": ""Mark"" - }, - ""router"": { - ""go-to-home"": ""回到首頁"" - }, - ""auth"": { - ""signup-as-host"": ""註冊為管理員"", - ""host-tip"": ""您註冊為此站台之管理員。"", - ""not-host-tip"": ""如果您沒有帳號，請聯絡網站管理員。"", - ""new-password"": ""新密碼"", - ""repeat-new-password"": ""再次輸入新密碼"" - }, - ""editor"": { - ""editing"": ""編輯中..."", - ""cancel-edit"": ""取消編輯"", - ""save"": ""儲存"", - ""placeholder"": ""任何想法..."", - ""only-image-supported"": ""僅支援圖片檔案。"", - ""cant-empty"": ""內容不能為空"", - ""local"": ""本機"", - ""resources"": ""資源"" - }, - ""memo"": { - ""view-detail"": ""查看詳情"", - ""copy-link"": ""複製連結"", - ""embed"": ""內嵌"", - ""archived-memos"": ""封存的備忘錄"", - ""no-archived-memos"": ""無封存的備忘錄。"", - ""fetching-data"": ""抓取資料中..."", - ""fetch-more"": ""點此以載入更多"", - ""archived-at"": ""封存於"", - ""search-placeholder"": ""搜尋備忘錄"", - ""visibility"": { - ""private"": ""私人"", - ""protected"": ""成員可見"", - ""public"": ""公開給所有人"", - ""disabled"": ""公共備忘錄已停用"" + ""router"": { + ""go-to-home"": ""回到首頁"" }, - ""delete-memo"": ""刪除備忘錄"", - ""delete-confirm"": ""您確定要刪除此備忘錄？\n\n此動作為不可逆❗"" - }, - ""resource"": { - ""no-resources"": ""沒有資源。"", - ""fetching-data"": ""抓取資料..."", - ""copy-link"": ""複製連結"", - ""reset-link"": ""重設連結"", - ""reset-resource-link"": ""重設資源連結"", - ""reset-link-prompt"": ""您確定要重設連結？\n這將會破壞所有目前的使用中的連結。\n\n此動作為不可逆❗"", - ""delete-resource"": ""刪除資源"", - ""linked-amount"": ""連結的數量"", - ""warning-text"": ""您確定要刪除此資源？\n\n此動作為不可逆❗"", - ""warning-text-unused"": ""您確定要刪除這些未使用的資源？\n\n此動作為不可逆❗"", - ""no-unused-resources"": ""無未使用的資源"", - ""delete-selected-resources"": ""刪除所選的資源"", - ""no-files-selected"": ""沒有檔案被選取❗"", - ""upload-successfully"": ""上傳成功"", - ""file-drag-drop-prompt"": ""拖曳您的檔案到此處以上傳檔案"", - ""search-bar-placeholder"": ""搜尋資源"", - ""clear"": ""清除"", - ""create-dialog"": { - ""title"": ""新增資源"", - ""upload-method"": ""上傳方式"", - ""local-file"": { - ""option"": ""本機檔案"", - ""choose"": ""選擇檔案..."" - }, - ""external-link"": { - ""option"": ""外部連結"", - ""link"": ""連結"", - ""link-placeholder"": ""https://the.link.to/your/resource"", - ""file-name"": ""檔案名稱"", - ""file-name-placeholder"": ""檔案名稱"", - ""type"": ""類型"", - ""type-placeholder"": ""檔案類型"" - } - } - }, - ""tag-list"": { - ""tip-text"": ""輸入 `#tag` 以新增標籤"", - ""create-tag"": ""建立標籤"", - ""all-tags"": ""所有標籤"", - ""tag-name"": ""標籤名稱"", - ""invalid-tag-name"": ""無效的標籤名稱"", - ""tag-suggestions"": ""標籤建議"", - ""show"": ""顯示"", - ""hide"": ""隱藏"", - ""save-all"": ""全部儲存"" - }, - ""daily-review"": { - ""title"": ""每日回顧"", - ""no-memos"": ""啊咧，這裡啥都沒有。"" - }, - ""setting"": { - ""my-account"": ""我的帳號"", - ""preference"": ""偏好設定"", - ""member"": ""使用者"", - ""member-list"": ""使用者列表"", - ""system"": ""系統"", - ""storage"": ""儲存空間"", - ""sso"": ""SSO"", - ""account-section"": { - ""title"": ""帳號資訊"", - ""username-note"": ""為登入用途"", - ""nickname-note"": ""顯示於橫幅"", - ""email-note"": ""非必須的"", - ""update-information"": ""更新個人資訊"", - ""change-password"": ""變更密碼"", - ""reset-api"": ""重設 API"", - ""openapi-title"": ""OpenAPI"", - ""openapi-reset"": ""重設 OpenAPI 金鑰"", - ""openapi-reset-warning"": ""❗ 將使現有的 API 金鑰無效並產生新金鑰。\n\n您確定要重設嗎？"", - ""openapi-sample-post"": ""哈囉 來自 {{url}} 的 #memos"" + ""auth"": { + ""host-tip"": ""您註冊為此站台之管理員。"", + ""new-password"": ""新密碼"", + ""repeat-new-password"": ""再次輸入新密碼"" }, - ""preference-section"": { - ""theme"": ""主題"", - ""default-memo-visibility"": ""備忘錄預設之能見度"", - ""default-resource-visibility"": ""資源預設之能見度"", - ""enable-folding-memo"": ""啟用折疊備忘錄"", - ""enable-double-click"": ""啟用連點兩次以編輯"", - ""editor-font-style"": ""編輯器字體樣式"", - ""mobile-editor-style"": ""行動版編輯器樣式"", - ""default-memo-sort-option"": ""備忘錄顯示時間"", - ""telegram-user-id"": ""Telegram UserID"", - ""telegram-user-id-placeholder"": ""向 Telegram 機器人傳送任意訊息以取得"", - ""created_ts"": ""建立時間"", - ""updated_ts"": ""更新時間"", - ""daily-review-time-offset"": ""每日回顧時間偏移"", - ""auto-collapse"": ""自動摺疊"" + ""editor"": { + ""editing"": ""編輯中..."", + ""cancel-edit"": ""取消編輯"", + ""save"": ""儲存"", + ""placeholder"": ""任何想法..."", + ""only-image-supported"": ""僅支援圖片檔案。"", + ""cant-empty"": ""內容不能為空"", + ""local"": ""本機"", + ""resources"": ""資源"" }, - ""storage-section"": { - ""current-storage"": ""目前的儲存空間"", - ""type-database"": ""資料庫"", - ""type-local"": ""本機"", - ""storage-services-list"": ""儲存服務列表"", - ""create-a-service"": ""建立服務"", - ""update-a-service"": ""更新服務"", - ""warning-text"": ""您確定要刪除儲存服務 \""{{name}}\""嗎?\n\n此動作為不可逆❗"", - ""delete-storage"": ""刪除儲存"", - ""local-storage-path"": ""本機儲存空間路徑"", - ""update-local-path"": ""更新本機儲存空間路徑"", - ""update-local-path-description"": ""本機儲存空間路徑為資料庫檔案的相對路徑"", - ""create-storage"": ""新增儲存空間"", - ""update-storage"": ""更新儲存空間"", - ""endpoint"": ""端點"", - ""s3-compatible-url"": ""S3 相容網址"", - ""region"": ""地區"", - ""region-placeholder"": ""地區名稱"", - ""accesskey"": ""存取金鑰"", - ""accesskey-placeholder"": ""存取金鑰 / 存取 ID"", - ""secretkey"": ""密鑰"", - ""secretkey-placeholder"": ""密鑰 / 存取金鑰"", - ""bucket"": ""Bucket"", - ""bucket-placeholder"": ""Bucket 名稱"", - ""path"": ""儲存空間路徑"", - ""path-description"": ""您可以使用與本機儲存空間相同的動態變數，如 {filename}"", - ""path-placeholder"": ""custom/path"", - ""url-prefix"": ""網址前綴"", - ""url-prefix-placeholder"": ""自訂網址前綴，選填"", - ""url-suffix"": ""網址後綴"", - ""url-suffix-placeholder"": ""自訂網址後綴，選填"" + ""memo"": { + ""view-detail"": ""查看詳情"", + ""copy-link"": ""複製連結"", + ""embed"": ""內嵌"", + ""archived-memos"": ""封存的備忘錄"", + ""no-archived-memos"": ""無封存的備忘錄。"", + ""fetching-data"": ""抓取資料中..."", + ""fetch-more"": ""點此以載入更多"", + ""archived-at"": ""封存於"", + ""search-placeholder"": ""搜尋備忘錄"", + ""visibility"": { + ""private"": ""私人"", + ""protected"": ""成員可見"", + ""public"": ""公開給所有人"", + ""disabled"": ""公共備忘錄已停用"" + }, + ""delete-memo"": ""刪除備忘錄"", + ""delete-confirm"": ""您確定要刪除此備忘錄？\n\n此動作為不可逆❗"" }, - ""member-section"": { - ""create-a-member"": ""新增使用者"", - ""archive-member"": ""封存使用者"", - ""archive-warning"": ""❗ 您確定要封存 {{username}}?"", - ""delete-member"": ""刪除使用者"", - ""delete-warning"": ""❗ A您確定要刪除 {{username}}?\n\n此動作為不可逆❗"" + ""resource"": { + ""no-resources"": ""沒有資源。"", + ""fetching-data"": ""抓取資料..."", + ""copy-link"": ""複製連結"", + ""reset-link"": ""重設連結"", + ""reset-resource-link"": ""重設資源連結"", + ""reset-link-prompt"": ""您確定要重設連結？\n這將會破壞所有目前的使用中的連結。\n\n此動作為不可逆❗"", + ""delete-resource"": ""刪除資源"", + ""linked-amount"": ""連結的數量"", + ""warning-text"": ""您確定要刪除此資源？\n\n此動作為不可逆❗"", + ""warning-text-unused"": ""您確定要刪除這些未使用的資源？\n\n此動作為不可逆❗"", + ""no-unused-resources"": ""無未使用的資源"", + ""delete-selected-resources"": ""刪除所選的資源"", + ""no-files-selected"": ""沒有檔案被選取❗"", + ""upload-successfully"": ""上傳成功"", + ""file-drag-drop-prompt"": ""拖曳您的檔案到此處以上傳檔案"", + ""search-bar-placeholder"": ""搜尋資源"", + ""clear"": ""清除"", + ""create-dialog"": { + ""title"": ""新增資源"", + ""upload-method"": ""上傳方式"", + ""local-file"": { + ""option"": ""本機檔案"", + ""choose"": ""選擇檔案..."" + }, + ""external-link"": { + ""option"": ""外部連結"", + ""link"": ""連結"", + ""link-placeholder"": ""https://the.link.to/your/resource"", + ""file-name"": ""檔案名稱"", + ""file-name-placeholder"": ""檔案名稱"", + ""type"": ""類型"", + ""type-placeholder"": ""檔案類型"" + } + } }, - ""system-section"": { - ""server-name"": ""伺服器名稱"", - ""customize-server"": { - ""title"": ""自訂伺服器"", - ""default"": ""預設為 memos"", - ""icon-url"": ""圖示網址"", - ""description"": ""描述"", - ""locale"": ""伺服器語言"", - ""appearance"": ""伺服器外觀"" - }, - ""database-file-size"": ""資料庫檔案大小"", - ""allow-user-signup"": ""允許使用者註冊"", - ""disable-password-login"": ""禁用密碼登入"", - ""disable-password-login-warning"": ""所有使用者將無法使用密碼登入。如果配置的身份識別提供者失效，不在資料庫中恢復此設定將無法登入。刪除身分識別提供者時也要特別小心❗"", - ""disable-password-login-final-warning"": ""如果你知道自己在做什麼，請輸入 \""CONFIRM\"""", - ""enable-password-login"": ""啟用密碼登入"", - ""enable-password-login-warning"": ""啟用所有使用者的密碼登入。如果希望使用者同時使用 SSO 和密碼登入，請開啟密碼登入❗"", - ""ignore-version-upgrade"": ""忽略版本更新提示"", - ""disable-public-memos"": ""停用公共備忘錄"", - ""max-upload-size"": ""最大上傳檔案大小 (MiB)"", - ""max-upload-size-hint"": ""建議值為 32 MiB。"", - ""auto-backup-interval"": ""自動備份間隔(單位：秒)"", - ""auto-backup-interval-hint"": ""設定為0禁止自動備份，重新啟動後生效"", - ""additional-style"": ""自訂樣式"", - ""additional-script"": ""自訂腳本"", - ""additional-style-placeholder"": ""自訂 CSS 代碼"", - ""additional-script-placeholder"": ""自訂 JavaScript 代碼"", - ""telegram-bot-token"": ""Telegram 機器人權杖"", - ""telegram-bot-token-description"": ""Telegram 機器人權杖或 API Proxy，如 `http.../bot`"", - ""telegram-bot-token-placeholder"": ""您的 Telegram 機器人權杖"", - ""display-with-updated-time"": ""顯示更新時間"" + ""tag-list"": { + ""tip-text"": ""輸入 `#tag` 以新增標籤"", + ""create-tag"": ""建立標籤"", + ""all-tags"": ""所有標籤"", + ""tag-name"": ""標籤名稱"", + ""invalid-tag-name"": ""無效的標籤名稱"", + ""tag-suggestions"": ""標籤建議"", + ""show"": ""顯示"", + ""hide"": ""隱藏"", + ""save-all"": ""全部儲存"" }, - ""appearance-option"": { - ""system"": ""跟隨系統"", - ""light"": ""總是淺色"", - ""dark"": ""總是深色"" + ""daily-review"": { + ""title"": ""每日回顧"", + ""no-memos"": ""啊咧，這裡啥都沒有。"" }, - ""sso-section"": { - ""sso-list"": ""SSO 列表"", - ""delete-sso"": ""確認刪除"", - ""confirm-delete"": ""您確定要刪除 \""{{name}}\"" SSO 設定？\n\n此動作為不可逆❗"", - ""create-sso"": ""新增 SSO"", - ""update-sso"": ""更新 SSO"", - ""sso-created"": ""SSO {{name}} 新增成功"", - ""sso-updated"": ""SSO {{name}} 更新成功"", - ""identifier"": ""識別碼"", - ""display-name"": ""顯示名稱"", - ""template"": ""範本"", - ""custom"": ""自訂"", - ""identifier-filter"": ""識別碼過濾器"", - ""redirect-url"": ""重新導向網址"", - ""client-id"": ""客戶端 ID"", - ""client-secret"": ""客戶端密鑰"", - ""authorization-endpoint"": ""驗證端點"", - ""token-endpoint"": ""權杖端點"", - ""user-endpoint"": ""使用者端點"", - ""scopes"": ""範圍"" - } - }, - ""filter"": { - ""new-filter"": ""新增過濾器"", - ""type"": { - ""tag"": ""標籤"", - ""type"": ""類型"", - ""text"": ""文字"", - ""display-time"": ""顯示時間"", - ""visibility"": ""可見度"" + ""setting"": { + ""my-account"": ""我的帳號"", + ""preference"": ""偏好設定"", + ""member"": ""使用者"", + ""member-list"": ""使用者列表"", + ""system"": ""系統"", + ""storage"": ""儲存空間"", + ""sso"": ""SSO"", + ""account-section"": { + ""title"": ""帳號資訊"", + ""username-note"": ""為登入用途"", + ""nickname-note"": ""顯示於橫幅"", + ""email-note"": ""非必須的"", + ""update-information"": ""更新個人資訊"", + ""change-password"": ""變更密碼"", + ""reset-api"": ""重設 API"", + ""openapi-title"": ""OpenAPI"", + ""openapi-reset"": ""重設 OpenAPI 金鑰"", + ""openapi-reset-warning"": ""❗ 將使現有的 API 金鑰無效並產生新金鑰。\n\n您確定要重設嗎？"", + ""openapi-sample-post"": ""哈囉 來自 {{url}} 的 #memos"" + }, + ""preference-section"": { + ""theme"": ""主題"", + ""default-memo-visibility"": ""備忘錄預設之能見度"", + ""default-resource-visibility"": ""資源預設之能見度"", + ""enable-folding-memo"": ""啟用折疊備忘錄"", + ""enable-double-click"": ""啟用連點兩次以編輯"", + ""editor-font-style"": ""編輯器字體樣式"", + ""mobile-editor-style"": ""行動版編輯器樣式"", + ""default-memo-sort-option"": ""備忘錄顯示時間"", + ""telegram-user-id"": ""Telegram UserID"", + ""telegram-user-id-placeholder"": ""向 Telegram 機器人傳送任意訊息以取得"", + ""created_ts"": ""建立時間"", + ""updated_ts"": ""更新時間"", + ""daily-review-time-offset"": ""每日回顧時間偏移"", + ""auto-collapse"": ""自動摺疊"" + }, + ""storage-section"": { + ""current-storage"": ""目前的儲存空間"", + ""type-database"": ""資料庫"", + ""type-local"": ""本機"", + ""storage-services-list"": ""儲存服務列表"", + ""create-a-service"": ""建立服務"", + ""update-a-service"": ""更新服務"", + ""warning-text"": ""您確定要刪除儲存服務 \""{{name}}\""嗎?\n\n此動作為不可逆❗"", + ""delete-storage"": ""刪除儲存"", + ""local-storage-path"": ""本機儲存空間路徑"", + ""update-local-path"": ""更新本機儲存空間路徑"", + ""update-local-path-description"": ""本機儲存空間路徑為資料庫檔案的相對路徑"", + ""create-storage"": ""新增儲存空間"", + ""update-storage"": ""更新儲存空間"", + ""endpoint"": ""端點"", + ""s3-compatible-url"": ""S3 相容網址"", + ""region"": ""地區"", + ""region-placeholder"": ""地區名稱"", + ""accesskey"": ""存取金鑰"", + ""accesskey-placeholder"": ""存取金鑰 / 存取 ID"", + ""secretkey"": ""密鑰"", + ""secretkey-placeholder"": ""密鑰 / 存取金鑰"", + ""bucket"": ""Bucket"", + ""bucket-placeholder"": ""Bucket 名稱"", + ""path"": ""儲存空間路徑"", + ""path-description"": ""您可以使用與本機儲存空間相同的動態變數，如 {filename}"", + ""path-placeholder"": ""custom/path"", + ""url-prefix"": ""網址前綴"", + ""url-prefix-placeholder"": ""自訂網址前綴，選填"", + ""url-suffix"": ""網址後綴"", + ""url-suffix-placeholder"": ""自訂網址後綴，選填"" + }, + ""member-section"": { + ""create-a-member"": ""新增使用者"", + ""archive-member"": ""封存使用者"", + ""archive-warning"": ""❗ 您確定要封存 {{username}}?"", + ""delete-member"": ""刪除使用者"", + ""delete-warning"": ""❗ A您確定要刪除 {{username}}?\n\n此動作為不可逆❗"" + }, + ""system-section"": { + ""server-name"": ""伺服器名稱"", + ""customize-server"": { + ""title"": ""自訂伺服器"", + ""default"": ""預設為 memos"", + ""icon-url"": ""圖示網址"", + ""description"": ""描述"", + ""locale"": ""伺服器語言"", + ""appearance"": ""伺服器外觀"" + }, + ""database-file-size"": ""資料庫檔案大小"", + ""allow-user-signup"": ""允許使用者註冊"", + ""disable-password-login"": ""禁用密碼登入"", + ""disable-password-login-warning"": ""所有使用者將無法使用密碼登入。如果配置的身份識別提供者失效，不在資料庫中恢復此設定將無法登入。刪除身分識別提供者時也要特別小心❗"", + ""disable-password-login-final-warning"": ""如果你知道自己在做什麼，請輸入 \""CONFIRM\"""", + ""enable-password-login"": ""啟用密碼登入"", + ""enable-password-login-warning"": ""啟用所有使用者的密碼登入。如果希望使用者同時使用 SSO 和密碼登入，請開啟密碼登入❗"", + ""ignore-version-upgrade"": ""忽略版本更新提示"", + ""disable-public-memos"": ""停用公共備忘錄"", + ""max-upload-size"": ""最大上傳檔案大小 (MiB)"", + ""max-upload-size-hint"": ""建議值為 32 MiB。"", + ""auto-backup-interval"": ""自動備份間隔(單位：秒)"", + ""auto-backup-interval-hint"": ""設定為0禁止自動備份，重新啟動後生效"", + ""additional-style"": ""自訂樣式"", + ""additional-script"": ""自訂腳本"", + ""additional-style-placeholder"": ""自訂 CSS 代碼"", + ""additional-script-placeholder"": ""自訂 JavaScript 代碼"", + ""telegram-bot-token"": ""Telegram 機器人權杖"", + ""telegram-bot-token-description"": ""Telegram 機器人權杖或 API Proxy，如 `http.../bot`"", + ""telegram-bot-token-placeholder"": ""您的 Telegram 機器人權杖"", + ""display-with-updated-time"": ""顯示更新時間"" + }, + ""appearance-option"": { + ""system"": ""跟隨系統"", + ""light"": ""總是淺色"", + ""dark"": ""總是深色"" + }, + ""sso-section"": { + ""sso-list"": ""SSO 列表"", + ""delete-sso"": ""確認刪除"", + ""confirm-delete"": ""您確定要刪除 \""{{name}}\"" SSO 設定？\n\n此動作為不可逆❗"", + ""create-sso"": ""新增 SSO"", + ""update-sso"": ""更新 SSO"", + ""sso-created"": ""SSO {{name}} 新增成功"", + ""sso-updated"": ""SSO {{name}} 更新成功"", + ""identifier"": ""識別碼"", + ""display-name"": ""顯示名稱"", + ""template"": ""範本"", + ""custom"": ""自訂"", + ""identifier-filter"": ""識別碼過濾器"", + ""redirect-url"": ""重新導向網址"", + ""client-id"": ""客戶端 ID"", + ""client-secret"": ""客戶端密鑰"", + ""authorization-endpoint"": ""驗證端點"", + ""token-endpoint"": ""權杖端點"", + ""user-endpoint"": ""使用者端點"", + ""scopes"": ""範圍"" + } + }, + ""message"": { + ""no-data"": ""或許尋覓虛空，或者改換選擇之軌跡。"", + ""memos-ready"": ""所有備忘錄已就緒 🎉"", + ""resource-ready"": ""所有資源已就緒 🎉"", + ""restored-successfully"": ""還原成功"", + ""memo-updated-datetime"": ""備忘錄建立日期時間已變更。"", + ""invalid-created-datetime"": ""建立的日期時間無效。"", + ""change-memo-created-time"": ""變更備忘錄建立時間"", + ""change-memo-created-time-warning-1"": ""這非正常的行為。"", + ""change-memo-created-time-warning-2"": ""請確定您真的需要這麼做。"", + ""memo-not-found"": ""找不到備忘錄。"", + ""fill-all"": ""請填寫所有欄位。"", + ""password-not-match"": ""密碼不一致。"", + ""new-password-not-match"": ""新密碼不一致。"", + ""image-load-failed"": ""圖片讀取失敗"", + ""fill-form"": ""請填寫此表單"", + ""fill-server-name"": ""請填寫伺服器名稱"", + ""login-failed"": ""登入失敗"", + ""signup-failed"": ""註冊失敗"", + ""user-not-found"": ""查無該使用者"", + ""password-changed"": ""密碼變更完成"", + ""private-only"": ""此備忘錄僅自己可見。"", + ""copied"": ""已複製"", + ""succeed-copy-content"": ""複製內容到剪貼板成功。"", + ""succeed-copy-code"": ""複製程式碼到剪貼簿成功。"", + ""succeed-copy-link"": ""複製連結到剪貼簿成功。"", + ""change-resource-filename"": ""變更資源檔名"", + ""resource-filename-updated"": ""資源檔名變更成功。"", + ""invalid-resource-filename"": ""無效的檔名。"", + ""click-to-save-the-image"": ""點選以儲存圖片"", + ""generating-the-screenshot"": ""正在產生截圖..."", + ""count-selected-resources"": ""全部選取"", + ""succeed-vacuum-database"": ""清理資料庫成功。"", + ""succeed-update-additional-style"": ""更新附加樣式成功。"", + ""succeed-copy-resource-link"": ""複製資源連結到剪貼簿成功。"", + ""succeed-update-customized-profile"": ""更新自訂配置文件成功。"", + ""succeed-update-additional-script"": ""更新附加腳本成功。"", + ""update-succeed"": ""更新成功"", + ""page-not-found"": ""404 - 網頁無法顯示 😥"", + ""maximum-upload-size-is"": ""最大允許檔案上傳大小 {{size}} MiB"", + ""file-exceeds-upload-limit-of"": ""檔案 {{file}} 超過上傳限制 {{size}} MiB"", + ""updating-setting-failed"": ""更新設定失敗"", + ""password-login-disabled"": ""在禁用密碼登入時無法移除最後一個身份識別提供者"" }, - ""operator"": { - ""contains"": ""包含"", - ""not-contains"": ""不包含"", - ""is"": ""是"", - ""is-not"": ""不是"", - ""before"": ""之前"", - ""after"": ""之後"" + ""days"": { + ""mon"": ""一"", + ""tue"": ""二"", + ""wed"": ""三"", + ""thu"": ""四"", + ""fri"": ""五"", + ""sat"": ""六"", + ""sun"": ""日"" }, - ""value"": { - ""not-tagged"": ""無標籤"", - ""linked"": ""包含連結"", - ""has-attachment"": ""包含附件"" + ""embed-memo"": { + ""title"": ""嵌入備忘錄"", + ""text"": ""將以下程式碼複製並貼上到您的網誌或網站中。"", + ""only-public-supported"": ""* 只有公開的備忘錄可以被嵌入。"", + ""copy"": ""複製"" }, - ""text-placeholder"": ""開頭用 ^ 以使用正規式"", - ""and"": ""且"", - ""or"": ""或"" - }, - ""message"": { - ""no-data"": ""或許尋覓虛空，或者改換選擇之軌跡。"", - ""memos-ready"": ""所有備忘錄已就緒 🎉"", - ""resource-ready"": ""所有資源已就緒 🎉"", - ""restored-successfully"": ""還原成功"", - ""memo-updated-datetime"": ""備忘錄建立日期時間已變更。"", - ""invalid-created-datetime"": ""建立的日期時間無效。"", - ""change-memo-created-time"": ""變更備忘錄建立時間"", - ""change-memo-created-time-warning-1"": ""這非正常的行為。"", - ""change-memo-created-time-warning-2"": ""請確定您真的需要這麼做。"", - ""memo-not-found"": ""找不到備忘錄。"", - ""fill-all"": ""請填寫所有欄位。"", - ""password-not-match"": ""密碼不一致。"", - ""new-password-not-match"": ""新密碼不一致。"", - ""image-load-failed"": ""圖片讀取失敗"", - ""fill-form"": ""請填寫此表單"", - ""fill-server-name"": ""請填寫伺服器名稱"", - ""login-failed"": ""登入失敗"", - ""signup-failed"": ""註冊失敗"", - ""user-not-found"": ""查無該使用者"", - ""password-changed"": ""密碼變更完成"", - ""private-only"": ""此備忘錄僅自己可見。"", - ""copied"": ""已複製"", - ""succeed-copy-content"": ""複製內容到剪貼板成功。"", - ""succeed-copy-code"": ""複製程式碼到剪貼簿成功。"", - ""succeed-copy-link"": ""複製連結到剪貼簿成功。"", - ""change-resource-filename"": ""變更資源檔名"", - ""resource-filename-updated"": ""資源檔名變更成功。"", - ""invalid-resource-filename"": ""無效的檔名。"", - ""click-to-save-the-image"": ""點選以儲存圖片"", - ""generating-the-screenshot"": ""正在產生截圖..."", - ""count-selected-resources"": ""全部選取"", - ""too-short"": ""太短"", - ""too-long"": ""太長"", - ""not-allow-space"": ""不能有空格"", - ""not-allow-chinese"": ""不能有中文字"", - ""succeed-vacuum-database"": ""清理資料庫成功。"", - ""succeed-update-additional-style"": ""更新附加樣式成功。"", - ""succeed-copy-resource-link"": ""複製資源連結到剪貼簿成功。"", - ""succeed-update-customized-profile"": ""更新自訂配置文件成功。"", - ""succeed-update-additional-script"": ""更新附加腳本成功。"", - ""update-succeed"": ""更新成功"", - ""page-not-found"": ""404 - 網頁無法顯示 😥"", - ""maximum-upload-size-is"": ""最大允許檔案上傳大小 {{size}} MiB"", - ""file-exceeds-upload-limit-of"": ""檔案 {{file}} 超過上傳限制 {{size}} MiB"", - ""updating-setting-failed"": ""更新設定失敗"", - ""password-login-disabled"": ""在禁用密碼登入時無法移除最後一個身份識別提供者"" - }, - ""days"": { - ""mon"": ""一"", - ""tue"": ""二"", - ""wed"": ""三"", - ""thu"": ""四"", - ""fri"": ""五"", - ""sat"": ""六"", - ""sun"": ""日"" - }, - ""embed-memo"": { - ""title"": ""嵌入備忘錄"", - ""text"": ""將以下程式碼複製並貼上到您的網誌或網站中。"", - ""only-public-supported"": ""* 只有公開的備忘錄可以被嵌入。"", - ""copy"": ""複製"" - }, - ""heatmap"": { - ""memo-in"": ""memo in {{period}}"", - ""memos-in"": ""memos in {{period}}"", - ""memo-on"": ""{{amount}} memo on {{date}}"", - ""memos-on"": ""{{amount}} memos on {{date}}"", - ""day"": ""天"", - ""days"": ""天"" - }, - ""about"": { - ""about-memos"": ""關於 Memos"", - ""memos-description"": ""Memos 是一個網頁式的筆記應用程式，您可用它記錄、組織以及分享你的筆記"", - ""no-server-description"": ""此伺服器未設置說明。"", - ""powered-by"": ""威力本源"", - ""other-projects"": ""其他專案"" - } + ""heatmap"": { + ""memo-in"": ""memo in {{period}}"", + ""memos-in"": ""memos in {{period}}"", + ""memo-on"": ""{{amount}} memo on {{date}}"", + ""memos-on"": ""{{amount}} memos on {{date}}"", + ""day"": ""天"", + ""days"": ""天"" + }, + ""about"": { + ""about-memos"": ""關於 Memos"", + ""memos-description"": ""Memos 是一個網頁式的筆記應用程式，您可用它記錄、組織以及分享你的筆記"", + ""no-server-description"": ""此伺服器未設置說明。"", + ""powered-by"": ""威力本源"", + ""other-projects"": ""其他專案"" + } }",chore,update i18n with weblate (#2332) cb569c99fdeb1bef6fb53e90346819b2ac1be97a,2024-12-07 09:56:21,johnnyjoy,chore: remove useCallback in fetching memo list,False,"diff --git a/web/src/components/PagedMemoList/PagedMemoList.tsx b/web/src/components/PagedMemoList/PagedMemoList.tsx index 110f34d330899..43e4e7a470cb2 100644 --- a/web/src/components/PagedMemoList/PagedMemoList.tsx +++ b/web/src/components/PagedMemoList/PagedMemoList.tsx @@ -1,6 +1,6 @@ import { Button } from ""@usememos/mui""; import { ArrowDownIcon, LoaderIcon } from ""lucide-react""; -import { useCallback, useEffect, useState } from ""react""; +import { useEffect, useState } from ""react""; import PullToRefresh from ""react-simple-pull-to-refresh""; import { DEFAULT_LIST_MEMOS_PAGE_SIZE } from ""@/helpers/consts""; import useResponsiveWidth from ""@/hooks/useResponsiveWidth""; @@ -45,11 +45,11 @@ const PagedMemoList = (props: Props) => { })); }; - const refreshList = useCallback(async () => { + const refreshList = async () => { memoList.reset(); setState((state) => ({ ...state, nextPageToken: """" })); fetchMoreMemos(""""); - }, [props.filter, props.pageSize]); + }; useEffect(() => { refreshList();",chore,remove useCallback in fetching memo list 710961d336e8deebdbb44652564cac55d040f731,2024-08-29 18:09:24,Steven,chore: fix text color in dark mode,False,"diff --git a/web/src/pages/AdminSignIn.tsx b/web/src/pages/AdminSignIn.tsx index fae4f69b7e1b3..520dec2500b04 100644 --- a/web/src/pages/AdminSignIn.tsx +++ b/web/src/pages/AdminSignIn.tsx @@ -29,7 +29,7 @@ const AdminSignIn = () => { {workspaceGeneralSetting.customProfile?.title || ""Memos""}

-

Sign in with admin accounts

+

Sign in with admin accounts

",chore,fix text color in dark mode b02aa2d5e58bb0bea583c5018a1ad1f849617500,2023-12-08 07:25:18,K.B.Dharun Krishna,chore: bump actions in workflows (#2588),False,"diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index 01a50d6f4feda..a94fcb0536fb6 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.21 check-latest: true @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.21 check-latest: true diff --git a/.github/workflows/build-and-push-release-image.yml b/.github/workflows/build-and-push-release-image.yml index 4fba97afd5bb1..50e368fb78d1c 100644 --- a/.github/workflows/build-and-push-release-image.yml +++ b/.github/workflows/build-and-push-release-image.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Extract build args # Extract version from branch name @@ -25,13 +25,13 @@ jobs: echo ""VERSION=${GITHUB_REF_NAME#release/}"" >> $GITHUB_ENV - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: neosmemo password: ${{ secrets.DOCKER_NEOSMEMO_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -39,14 +39,14 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: install: true version: v0.9.1 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | neosmemo/memos @@ -58,7 +58,7 @@ jobs: - name: Build and Push id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/build-and-push-test-image.yml b/.github/workflows/build-and-push-test-image.yml index 23c0e9e106de1..419dec832fa04 100644 --- a/.github/workflows/build-and-push-test-image.yml +++ b/.github/workflows/build-and-push-test-image.yml @@ -14,16 +14,16 @@ jobs: - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: neosmemo password: ${{ secrets.DOCKER_NEOSMEMO_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -31,14 +31,14 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: install: true version: v0.9.1 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | neosmemo/memos @@ -50,7 +50,7 @@ jobs: - name: Build and Push id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 3b42dd860980e..06bfabb20a0cc 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -15,10 +15,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v2.2.4 + - uses: pnpm/action-setup@v2.4.0 with: version: 8 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: ""18"" cache: pnpm @@ -35,10 +35,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v2.2.4 + - uses: pnpm/action-setup@v2.4.0 with: version: 8 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: ""18"" cache: pnpm",chore,bump actions in workflows (#2588) b4f2a3bd14e2764ac34917bd8093ccd535645d4c,2024-01-31 20:28:43,Steven,chore: remove migrator,False,"diff --git a/bin/memos/main.go b/bin/memos/main.go index 98821c85d773e..47a9ca6274e1b 100644 --- a/bin/memos/main.go +++ b/bin/memos/main.go @@ -61,12 +61,6 @@ var ( } storeInstance := store.New(dbDriver, profile) - if err := storeInstance.MigrateManually(ctx); err != nil { - cancel() - log.Error(""failed to migrate manually"", zap.Error(err)) - return - } - s, err := server.NewServer(ctx, profile, storeInstance) if err != nil { cancel() diff --git a/store/migrator.go b/store/migrator.go deleted file mode 100644 index 3065d94b282cb..0000000000000 --- a/store/migrator.go +++ /dev/null @@ -1,276 +0,0 @@ -package store - -import ( - ""context"" - ""database/sql"" - ""fmt"" - ""os"" - ""strings"" - ""time"" - - ""github.com/lithammer/shortuuid/v4"" - ""github.com/pkg/errors"" - - ""github.com/usememos/memos/internal/log"" -) - -// MigrateResourceInternalPath migrates resource internal path from absolute path to relative path. -func (s *Store) MigrateResourceInternalPath(ctx context.Context) error { - normalizedDataPath := strings.ReplaceAll(s.Profile.Data, `\`, ""/"") - normalizedDataPath = strings.ReplaceAll(normalizedDataPath, `//`, ""/"") - - db := s.driver.GetDB() - checkStmt := ` - SELECT id FROM resource - WHERE - internal_path LIKE ? - OR internal_path LIKE ? - OR internal_path LIKE ? - LIMIT 1` - rows := 0 - res := db.QueryRowContext(ctx, checkStmt, fmt.Sprintf(""%s%%"", s.Profile.Data), fmt.Sprintf(""%s%%"", normalizedDataPath), ""%\\%"") - if err := res.Scan(&rows); err != nil { - if rows == 0 || err == sql.ErrNoRows { - log.Debug(""Resource internal path migration is not required."") - return nil - } - return errors.Wrap(err, ""failed to check resource internal_path"") - } - - log.Info(""Migrating resource internal paths. This may take a while."") - - listResourcesStmt := ` - SELECT id, internal_path FROM resource - WHERE - internal_path IS NOT '' - AND internal_path LIKE ? - OR internal_path LIKE ? - ` - resources, err := db.QueryContext(ctx, listResourcesStmt, fmt.Sprintf(""%s%%"", s.Profile.Data), fmt.Sprintf(""%s%%"", normalizedDataPath)) - if err != nil || resources.Err() != nil { - return errors.Wrap(err, ""failed to list resources"") - } - defer resources.Close() - - tx, err := db.BeginTx(ctx, nil) - if err != nil { - return errors.Wrap(err, ""failed to start transaction"") - } - defer tx.Rollback() - - updateStmt := `UPDATE resource SET internal_path = ? WHERE id = ?` - preparedResourceUpdate, err := tx.PrepareContext(ctx, updateStmt) - if err != nil { - return errors.Wrap(err, ""failed to prepare update statement"") - } - defer preparedResourceUpdate.Close() - - migrateStartTime := time.Now() - migratedCount := 0 - for resources.Next() { - resource := Resource{} - if err := resources.Scan(&resource.ID, &resource.InternalPath); err != nil { - return errors.Wrap(err, ""failed to parse resource data"") - } - - if resource.InternalPath == """" { - continue - } - - internalPath := strings.ReplaceAll(resource.InternalPath, `\`, ""/"") - if !strings.HasPrefix(internalPath, normalizedDataPath) { - continue - } - - internalPath = strings.TrimPrefix(internalPath, normalizedDataPath) - - for os.IsPathSeparator(internalPath[0]) { - internalPath = internalPath[1:] - } - - _, err := preparedResourceUpdate.ExecContext(ctx, internalPath, resource.ID) - if err != nil { - return errors.Wrap(err, ""failed to update resource internal_path"") - } - - if migratedCount%500 == 0 { - log.Info(fmt.Sprintf(""[Running] Migrated %d local resource paths"", migratedCount)) - } - - migratedCount++ - } - if err := tx.Commit(); err != nil { - return errors.Wrap(err, ""failed to commit transaction"") - } - - if migratedCount > 0 { - log.Info(fmt.Sprintf(""Migrated %d local resource paths in %s"", migratedCount, time.Since(migrateStartTime))) - } - return nil -} - -// MigrateResourceName migrates resource name from other format to short UUID. -func (s *Store) MigrateResourceName(ctx context.Context) error { - db := s.driver.GetDB() - - checkStmt := ` - SELECT resource_name FROM resource - WHERE - resource_name = '' - LIMIT 1` - rows := 0 - res := db.QueryRowContext(ctx, checkStmt) - if err := res.Scan(&rows); err != nil { - if rows == 0 || err == sql.ErrNoRows { - log.Debug(""Resource migration to UUIDs is not required."") - return nil - } - return errors.Wrap(err, ""failed to check resource.resource_name"") - } - - log.Info(""Migrating resource IDs to UUIDs. This may take a while."") - - listResourceStmt := ""SELECT `id`, `resource_name` FROM `resource` WHERE `resource_name` = ''"" - resources, err := db.QueryContext(ctx, listResourceStmt) - if err != nil || resources.Err() != nil { - return errors.Wrap(err, ""failed to list resources"") - } - defer resources.Close() - - tx, err := db.BeginTx(ctx, nil) - if err != nil { - return errors.Wrap(err, ""failed to start transaction"") - } - defer tx.Rollback() - - updateResourceStmt := ""UPDATE `resource` SET `resource_name` = ? WHERE `id` = ?"" - preparedResourceUpdate, err := tx.PrepareContext(ctx, updateResourceStmt) - if err != nil { - return errors.Wrap(err, ""failed to prepare update statement"") - } - defer preparedResourceUpdate.Close() - - migrateStartTime := time.Now() - migratedCount := 0 - for resources.Next() { - resource := Resource{} - if err := resources.Scan(&resource.ID, &resource.ResourceName); err != nil { - return errors.Wrap(err, ""failed to parse resource data"") - } - - if checkResourceName(resource.ResourceName) { - continue - } - - resourceName := shortuuid.New() - if _, err := preparedResourceUpdate.ExecContext(ctx, resourceName, resource.ID); err != nil { - return errors.Wrap(err, ""failed to update resource"") - } - - if migratedCount%500 == 0 { - log.Info(fmt.Sprintf(""[Running] Migrated %d local resources IDs"", migratedCount)) - } - migratedCount++ - } - if err := tx.Commit(); err != nil { - return errors.Wrap(err, ""failed to commit transaction"") - } - - if migratedCount > 0 { - log.Info(fmt.Sprintf(""Migrated %d resource IDs to UUIDs in %s"", migratedCount, time.Since(migrateStartTime))) - } - return nil -} - -// MigrateResourceName migrates memo name from other format to short UUID. -func (s *Store) MigrateMemoName(ctx context.Context) error { - db := s.driver.GetDB() - - checkStmt := ` - SELECT resource_name FROM memo - WHERE - resource_name = '' - LIMIT 1` - rows := 0 - res := db.QueryRowContext(ctx, checkStmt) - if err := res.Scan(&rows); err != nil { - if rows == 0 || err == sql.ErrNoRows { - log.Debug(""Memo migration to UUIDs is not required."") - return nil - } - return errors.Wrap(err, ""failed to check memo.resource_name"") - } - - log.Info(""Migrating memo ids to uuids. This may take a while."") - - listMemoStmt := ""SELECT `id`, `resource_name` FROM `memo` WHERE `resource_name` = ''"" - memos, err := db.QueryContext(ctx, listMemoStmt) - if err != nil || memos.Err() != nil { - return errors.Wrap(err, ""failed to list memos"") - } - defer memos.Close() - - tx, err := db.BeginTx(ctx, nil) - if err != nil { - return errors.Wrap(err, ""failed to start transaction"") - } - defer tx.Rollback() - - updateMemoStmt := ""UPDATE `memo` SET `resource_name` = ? WHERE `id` = ?"" - preparedMemoUpdate, err := tx.PrepareContext(ctx, updateMemoStmt) - if err != nil { - return errors.Wrap(err, ""failed to prepare update statement"") - } - defer preparedMemoUpdate.Close() - - migrateStartTime := time.Now() - migratedCount := 0 - for memos.Next() { - memo := Memo{} - if err := memos.Scan(&memo.ID, &memo.ResourceName); err != nil { - return errors.Wrap(err, ""failed to parse memo data"") - } - - if checkResourceName(memo.ResourceName) { - continue - } - - resourceName := shortuuid.New() - if _, err := preparedMemoUpdate.ExecContext(ctx, resourceName, memo.ID); err != nil { - return errors.Wrap(err, ""failed to update memo"") - } - - if migratedCount%500 == 0 { - log.Info(fmt.Sprintf(""[Running] Migrated %d local resources IDs"", migratedCount)) - } - migratedCount++ - } - if err := tx.Commit(); err != nil { - return errors.Wrap(err, ""failed to commit transaction"") - } - - if migratedCount > 0 { - log.Info(fmt.Sprintf(""Migrated %d memo ids to uuids in %s"", migratedCount, time.Since(migrateStartTime))) - } - return nil -} - -func checkResourceName(resourceName string) bool { - // 22 is the length of shortuuid. - if len(resourceName) != 22 { - return false - } - for _, c := range resourceName { - if c >= '0' && c <= '9' { - continue - } - if c >= 'a' && c <= 'z' { - continue - } - if c >= 'A' && c <= 'Z' { - continue - } - return false - } - return true -} diff --git a/store/store.go b/store/store.go index dd3450b876aa7..dcaf36b67ee84 100644 --- a/store/store.go +++ b/store/store.go @@ -25,19 +25,6 @@ func New(driver Driver, profile *profile.Profile) *Store { } } -func (s *Store) MigrateManually(ctx context.Context) error { - if err := s.MigrateResourceInternalPath(ctx); err != nil { - return err - } - if err := s.MigrateResourceName(ctx); err != nil { - return err - } - if err := s.MigrateMemoName(ctx); err != nil { - return err - } - return nil -} - func (s *Store) Vacuum(ctx context.Context) error { return s.driver.Vacuum(ctx) } diff --git a/test/store/migrator_test.go b/test/store/migrator_test.go deleted file mode 100644 index 0d71ca4fd41fa..0000000000000 --- a/test/store/migrator_test.go +++ /dev/null @@ -1,58 +0,0 @@ -package teststore - -import ( - ""context"" - ""testing"" - - ""github.com/lithammer/shortuuid/v4"" - ""github.com/stretchr/testify/require"" - - ""github.com/usememos/memos/store"" -) - -func TestMigrateResourceInternalPath(t *testing.T) { - ctx := context.Background() - ts := NewTestingStore(ctx, t) - user, err := createTestingHostUser(ctx, ts) - require.NoError(t, err) - - testCases := []map[string]string{ - { - ts.Profile.Data + ""/assets/test.jpg"": ""assets/test.jpg"", - }, - { - ts.Profile.Data + `\assets\test.jpg`: ""assets/test.jpg"", - }, - { - ""/unhandled/path/test.jpg"": ""/unhandled/path/test.jpg"", - }, - { - `C:\unhandled\path\assets\test.jpg`: `C:\unhandled\path\assets\test.jpg`, - }, - } - - for _, testCase := range testCases { - for input, expectedOutput := range testCase { - resourceCreate := &store.Resource{ - ResourceName: shortuuid.New(), - CreatorID: user.ID, - InternalPath: input, - } - createdResource, err := ts.CreateResource(ctx, resourceCreate) - require.NoError(t, err) - - err = ts.MigrateResourceInternalPath(ctx) - require.NoError(t, err) - - findResource := &store.FindResource{ - ID: &createdResource.ID, - } - resource, err := ts.GetResource(ctx, findResource) - require.NoError(t, err) - - require.Equal(t, expectedOutput, resource.InternalPath) - } - } - - ts.Close() -}",chore,remove migrator da603053f244c5240696730c2c60e4e2677f154e,2024-06-09 05:16:03,Steven,chore: add th locale,False,"diff --git a/web/src/i18n.ts b/web/src/i18n.ts index e391ca98f013d..693378de6b1b9 100644 --- a/web/src/i18n.ts +++ b/web/src/i18n.ts @@ -22,6 +22,7 @@ export const locales = [ ""ru"", ""sl"", ""sv"", + ""th"", ""tr"", ""uk"", ""vi"",",chore,add th locale 1542f3172a1294cf166f42c0a4f7e7372f415752,2023-10-03 07:09:39,Steven,chore: update tag service,False,"diff --git a/api/v2/tag_service.go b/api/v2/tag_service.go index d421987d3d99f..44700be9054b1 100644 --- a/api/v2/tag_service.go +++ b/api/v2/tag_service.go @@ -23,6 +23,25 @@ func NewTagService(store *store.Store) *TagService { } } +func (s *TagService) UpsertTag(ctx context.Context, request *apiv2pb.UpsertTagRequest) (*apiv2pb.UpsertTagResponse, error) { + user, err := getCurrentUser(ctx, s.Store) + if err != nil { + return nil, status.Errorf(codes.Internal, ""failed to get user"") + } + + tag, err := s.Store.UpsertTag(ctx, &store.Tag{ + Name: request.Name, + CreatorID: user.ID, + }) + if err != nil { + return nil, status.Errorf(codes.Internal, ""failed to upsert tag: %v"", err) + } + + return &apiv2pb.UpsertTagResponse{ + Tag: convertTagFromStore(tag), + }, nil +} + func (s *TagService) ListTags(ctx context.Context, request *apiv2pb.ListTagsRequest) (*apiv2pb.ListTagsResponse, error) { tags, err := s.Store.ListTags(ctx, &store.FindTag{ CreatorID: request.CreatorId, @@ -38,6 +57,18 @@ func (s *TagService) ListTags(ctx context.Context, request *apiv2pb.ListTagsRequ return response, nil } +func (s *TagService) DeleteTag(ctx context.Context, request *apiv2pb.DeleteTagRequest) (*apiv2pb.DeleteTagResponse, error) { + err := s.Store.DeleteTag(ctx, &store.DeleteTag{ + Name: request.Tag.Name, + CreatorID: request.Tag.CreatorId, + }) + if err != nil { + return nil, status.Errorf(codes.Internal, ""failed to delete tag: %v"", err) + } + + return &apiv2pb.DeleteTagResponse{}, nil +} + func convertTagFromStore(tag *store.Tag) *apiv2pb.Tag { return &apiv2pb.Tag{ Name: tag.Name, diff --git a/proto/api/v2/tag_service.proto b/proto/api/v2/tag_service.proto index 7c85c9561b596..ebcc50b3b6954 100644 --- a/proto/api/v2/tag_service.proto +++ b/proto/api/v2/tag_service.proto @@ -7,9 +7,15 @@ import ""google/api/annotations.proto""; option go_package = ""gen/api/v2""; service TagService { + rpc UpsertTag(UpsertTagRequest) returns (UpsertTagResponse) { + option (google.api.http) = {post: ""/api/v2/tags""}; + } rpc ListTags(ListTagsRequest) returns (ListTagsResponse) { option (google.api.http) = {get: ""/api/v2/tags""}; } + rpc DeleteTag(DeleteTagRequest) returns (DeleteTagResponse) { + option (google.api.http) = {delete: ""/api/v2/tags""}; + } } message Tag { @@ -17,6 +23,14 @@ message Tag { int32 creator_id = 2; } +message UpsertTagRequest { + string name = 1; +} + +message UpsertTagResponse { + Tag tag = 1; +} + message ListTagsRequest { int32 creator_id = 1; } @@ -24,3 +38,9 @@ message ListTagsRequest { message ListTagsResponse { repeated Tag tags = 1; } + +message DeleteTagRequest { + Tag tag = 1; +} + +message DeleteTagResponse {} diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.md index 06c497170b937..9421cbd2957e2 100644 --- a/proto/gen/api/v2/README.md +++ b/proto/gen/api/v2/README.md @@ -42,9 +42,13 @@ - [SystemService](#memos-api-v2-SystemService) - [api/v2/tag_service.proto](#api_v2_tag_service-proto) + - [DeleteTagRequest](#memos-api-v2-DeleteTagRequest) + - [DeleteTagResponse](#memos-api-v2-DeleteTagResponse) - [ListTagsRequest](#memos-api-v2-ListTagsRequest) - [ListTagsResponse](#memos-api-v2-ListTagsResponse) - [Tag](#memos-api-v2-Tag) + - [UpsertTagRequest](#memos-api-v2-UpsertTagRequest) + - [UpsertTagResponse](#memos-api-v2-UpsertTagResponse) - [TagService](#memos-api-v2-TagService) @@ -528,6 +532,31 @@ + + +### DeleteTagRequest + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| tag | [Tag](#memos-api-v2-Tag) | | | + + + + + + + + +### DeleteTagResponse + + + + + + + ### ListTagsRequest @@ -573,6 +602,36 @@ + + + +### UpsertTagRequest + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| name | [string](#string) | | | + + + + + + + + +### UpsertTagResponse + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| tag | [Tag](#memos-api-v2-Tag) | | | + + + + + @@ -587,7 +646,9 @@ | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| +| UpsertTag | [UpsertTagRequest](#memos-api-v2-UpsertTagRequest) | [UpsertTagResponse](#memos-api-v2-UpsertTagResponse) | | | ListTags | [ListTagsRequest](#memos-api-v2-ListTagsRequest) | [ListTagsResponse](#memos-api-v2-ListTagsResponse) | | +| DeleteTag | [DeleteTagRequest](#memos-api-v2-DeleteTagRequest) | [DeleteTagResponse](#memos-api-v2-DeleteTagResponse) | | diff --git a/proto/gen/api/v2/tag_service.pb.go b/proto/gen/api/v2/tag_service.pb.go index d3fb150caa79e..cd4d9bf395eca 100644 --- a/proto/gen/api/v2/tag_service.pb.go +++ b/proto/gen/api/v2/tag_service.pb.go @@ -76,6 +76,100 @@ func (x *Tag) GetCreatorId() int32 { return 0 } +type UpsertTagRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:""bytes,1,opt,name=name,proto3"" json:""name,omitempty""` +} + +func (x *UpsertTagRequest) Reset() { + *x = UpsertTagRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_tag_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UpsertTagRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpsertTagRequest) ProtoMessage() {} + +func (x *UpsertTagRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_tag_service_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpsertTagRequest.ProtoReflect.Descriptor instead. +func (*UpsertTagRequest) Descriptor() ([]byte, []int) { + return file_api_v2_tag_service_proto_rawDescGZIP(), []int{1} +} + +func (x *UpsertTagRequest) GetName() string { + if x != nil { + return x.Name + } + return """" +} + +type UpsertTagResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Tag *Tag `protobuf:""bytes,1,opt,name=tag,proto3"" json:""tag,omitempty""` +} + +func (x *UpsertTagResponse) Reset() { + *x = UpsertTagResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_tag_service_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UpsertTagResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpsertTagResponse) ProtoMessage() {} + +func (x *UpsertTagResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_tag_service_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpsertTagResponse.ProtoReflect.Descriptor instead. +func (*UpsertTagResponse) Descriptor() ([]byte, []int) { + return file_api_v2_tag_service_proto_rawDescGZIP(), []int{2} +} + +func (x *UpsertTagResponse) GetTag() *Tag { + if x != nil { + return x.Tag + } + return nil +} + type ListTagsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -87,7 +181,7 @@ type ListTagsRequest struct { func (x *ListTagsRequest) Reset() { *x = ListTagsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_v2_tag_service_proto_msgTypes[1] + mi := &file_api_v2_tag_service_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -100,7 +194,7 @@ func (x *ListTagsRequest) String() string { func (*ListTagsRequest) ProtoMessage() {} func (x *ListTagsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v2_tag_service_proto_msgTypes[1] + mi := &file_api_v2_tag_service_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -113,7 +207,7 @@ func (x *ListTagsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListTagsRequest.ProtoReflect.Descriptor instead. func (*ListTagsRequest) Descriptor() ([]byte, []int) { - return file_api_v2_tag_service_proto_rawDescGZIP(), []int{1} + return file_api_v2_tag_service_proto_rawDescGZIP(), []int{3} } func (x *ListTagsRequest) GetCreatorId() int32 { @@ -134,7 +228,7 @@ type ListTagsResponse struct { func (x *ListTagsResponse) Reset() { *x = ListTagsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_api_v2_tag_service_proto_msgTypes[2] + mi := &file_api_v2_tag_service_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -147,7 +241,7 @@ func (x *ListTagsResponse) String() string { func (*ListTagsResponse) ProtoMessage() {} func (x *ListTagsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v2_tag_service_proto_msgTypes[2] + mi := &file_api_v2_tag_service_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -160,7 +254,7 @@ func (x *ListTagsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListTagsResponse.ProtoReflect.Descriptor instead. func (*ListTagsResponse) Descriptor() ([]byte, []int) { - return file_api_v2_tag_service_proto_rawDescGZIP(), []int{2} + return file_api_v2_tag_service_proto_rawDescGZIP(), []int{4} } func (x *ListTagsResponse) GetTags() []*Tag { @@ -170,6 +264,91 @@ func (x *ListTagsResponse) GetTags() []*Tag { return nil } +type DeleteTagRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Tag *Tag `protobuf:""bytes,1,opt,name=tag,proto3"" json:""tag,omitempty""` +} + +func (x *DeleteTagRequest) Reset() { + *x = DeleteTagRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_tag_service_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DeleteTagRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteTagRequest) ProtoMessage() {} + +func (x *DeleteTagRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_tag_service_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteTagRequest.ProtoReflect.Descriptor instead. +func (*DeleteTagRequest) Descriptor() ([]byte, []int) { + return file_api_v2_tag_service_proto_rawDescGZIP(), []int{5} +} + +func (x *DeleteTagRequest) GetTag() *Tag { + if x != nil { + return x.Tag + } + return nil +} + +type DeleteTagResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *DeleteTagResponse) Reset() { + *x = DeleteTagResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_tag_service_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DeleteTagResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteTagResponse) ProtoMessage() {} + +func (x *DeleteTagResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_tag_service_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteTagResponse.ProtoReflect.Descriptor instead. +func (*DeleteTagResponse) Descriptor() ([]byte, []int) { + return file_api_v2_tag_service_proto_rawDescGZIP(), []int{6} +} + var File_api_v2_tag_service_proto protoreflect.FileDescriptor var file_api_v2_tag_service_proto_rawDesc = []byte{ @@ -181,31 +360,55 @@ var file_api_v2_tag_service_proto_rawDesc = []byte{ 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x22, 0x30, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x22, 0x39, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, - 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x32, 0x6d, 0x0a, - 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5f, 0x0a, 0x08, 0x4c, - 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x12, 0x0c, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x42, 0xa7, 0x01, 0x0a, - 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, - 0x32, 0x42, 0x0f, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, - 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, - 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65, - 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, - 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, - 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x26, 0x0a, 0x10, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a, 0x11, 0x55, 0x70, 0x73, 0x65, + 0x72, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, + 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x6d, + 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, + 0x61, 0x67, 0x22, 0x30, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x22, 0x39, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x22, + 0x37, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, + 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, 0x61, 0x67, 0x22, 0x13, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xb5, 0x02, + 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x62, 0x0a, 0x09, + 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x54, 0x61, 0x67, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, + 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x54, + 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, + 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x54, + 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x0e, 0x22, 0x0c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x61, 0x67, 0x73, + 0x12, 0x5f, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1d, 0x2e, 0x6d, + 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d, 0x65, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, + 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x0e, 0x12, 0x0c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x61, 0x67, + 0x73, 0x12, 0x62, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x1e, + 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, + 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x2a, 0x0c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, + 0x2f, 0x74, 0x61, 0x67, 0x73, 0x42, 0xa7, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0f, 0x54, 0x61, 0x67, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, + 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, + 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, + 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, + 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, + 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, + 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -220,21 +423,31 @@ func file_api_v2_tag_service_proto_rawDescGZIP() []byte { return file_api_v2_tag_service_proto_rawDescData } -var file_api_v2_tag_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_api_v2_tag_service_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_api_v2_tag_service_proto_goTypes = []interface{}{ - (*Tag)(nil), // 0: memos.api.v2.Tag - (*ListTagsRequest)(nil), // 1: memos.api.v2.ListTagsRequest - (*ListTagsResponse)(nil), // 2: memos.api.v2.ListTagsResponse + (*Tag)(nil), // 0: memos.api.v2.Tag + (*UpsertTagRequest)(nil), // 1: memos.api.v2.UpsertTagRequest + (*UpsertTagResponse)(nil), // 2: memos.api.v2.UpsertTagResponse + (*ListTagsRequest)(nil), // 3: memos.api.v2.ListTagsRequest + (*ListTagsResponse)(nil), // 4: memos.api.v2.ListTagsResponse + (*DeleteTagRequest)(nil), // 5: memos.api.v2.DeleteTagRequest + (*DeleteTagResponse)(nil), // 6: memos.api.v2.DeleteTagResponse } var file_api_v2_tag_service_proto_depIdxs = []int32{ - 0, // 0: memos.api.v2.ListTagsResponse.tags:type_name -> memos.api.v2.Tag - 1, // 1: memos.api.v2.TagService.ListTags:input_type -> memos.api.v2.ListTagsRequest - 2, // 2: memos.api.v2.TagService.ListTags:output_type -> memos.api.v2.ListTagsResponse - 2, // [2:3] is the sub-list for method output_type - 1, // [1:2] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 0, // 0: memos.api.v2.UpsertTagResponse.tag:type_name -> memos.api.v2.Tag + 0, // 1: memos.api.v2.ListTagsResponse.tags:type_name -> memos.api.v2.Tag + 0, // 2: memos.api.v2.DeleteTagRequest.tag:type_name -> memos.api.v2.Tag + 1, // 3: memos.api.v2.TagService.UpsertTag:input_type -> memos.api.v2.UpsertTagRequest + 3, // 4: memos.api.v2.TagService.ListTags:input_type -> memos.api.v2.ListTagsRequest + 5, // 5: memos.api.v2.TagService.DeleteTag:input_type -> memos.api.v2.DeleteTagRequest + 2, // 6: memos.api.v2.TagService.UpsertTag:output_type -> memos.api.v2.UpsertTagResponse + 4, // 7: memos.api.v2.TagService.ListTags:output_type -> memos.api.v2.ListTagsResponse + 6, // 8: memos.api.v2.TagService.DeleteTag:output_type -> memos.api.v2.DeleteTagResponse + 6, // [6:9] is the sub-list for method output_type + 3, // [3:6] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_api_v2_tag_service_proto_init() } @@ -256,7 +469,7 @@ func file_api_v2_tag_service_proto_init() { } } file_api_v2_tag_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListTagsRequest); i { + switch v := v.(*UpsertTagRequest); i { case 0: return &v.state case 1: @@ -268,6 +481,30 @@ func file_api_v2_tag_service_proto_init() { } } file_api_v2_tag_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UpsertTagResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_api_v2_tag_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ListTagsRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_api_v2_tag_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListTagsResponse); i { case 0: return &v.state @@ -279,6 +516,30 @@ func file_api_v2_tag_service_proto_init() { return nil } } + file_api_v2_tag_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DeleteTagRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_api_v2_tag_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DeleteTagResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -286,7 +547,7 @@ func file_api_v2_tag_service_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_api_v2_tag_service_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 7, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/gen/api/v2/tag_service.pb.gw.go b/proto/gen/api/v2/tag_service.pb.gw.go index 59bf6180a8875..d17731c2189e4 100644 --- a/proto/gen/api/v2/tag_service.pb.gw.go +++ b/proto/gen/api/v2/tag_service.pb.gw.go @@ -31,6 +31,42 @@ var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join +var ( + filter_TagService_UpsertTag_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_TagService_UpsertTag_0(ctx context.Context, marshaler runtime.Marshaler, client TagServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq UpsertTagRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_TagService_UpsertTag_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + + msg, err := client.UpsertTag(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_TagService_UpsertTag_0(ctx context.Context, marshaler runtime.Marshaler, server TagServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq UpsertTagRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_TagService_UpsertTag_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + + msg, err := server.UpsertTag(ctx, &protoReq) + return msg, metadata, err + +} + var ( filter_TagService_ListTags_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) @@ -67,12 +103,73 @@ func local_request_TagService_ListTags_0(ctx context.Context, marshaler runtime. } +var ( + filter_TagService_DeleteTag_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_TagService_DeleteTag_0(ctx context.Context, marshaler runtime.Marshaler, client TagServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq DeleteTagRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_TagService_DeleteTag_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + + msg, err := client.DeleteTag(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_TagService_DeleteTag_0(ctx context.Context, marshaler runtime.Marshaler, server TagServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq DeleteTagRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_TagService_DeleteTag_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, ""%v"", err) + } + + msg, err := server.DeleteTag(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterTagServiceHandlerServer registers the http handlers for service TagService to ""mux"". // UnaryRPC :call TagServiceServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterTagServiceHandlerFromEndpoint instead. func RegisterTagServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server TagServiceServer) error { + mux.Handle(""POST"", pattern_TagService_UpsertTag_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, ""/memos.api.v2.TagService/UpsertTag"", runtime.WithHTTPPathPattern(""/api/v2/tags"")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_TagService_UpsertTag_0(annotatedContext, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_TagService_UpsertTag_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle(""GET"", pattern_TagService_ListTags_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -98,6 +195,31 @@ func RegisterTagServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, }) + mux.Handle(""DELETE"", pattern_TagService_DeleteTag_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, ""/memos.api.v2.TagService/DeleteTag"", runtime.WithHTTPPathPattern(""/api/v2/tags"")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_TagService_DeleteTag_0(annotatedContext, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_TagService_DeleteTag_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -139,6 +261,28 @@ func RegisterTagServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn // ""TagServiceClient"" to call the correct interceptors. func RegisterTagServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client TagServiceClient) error { + mux.Handle(""POST"", pattern_TagService_UpsertTag_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, ""/memos.api.v2.TagService/UpsertTag"", runtime.WithHTTPPathPattern(""/api/v2/tags"")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_TagService_UpsertTag_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_TagService_UpsertTag_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle(""GET"", pattern_TagService_ListTags_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -161,13 +305,43 @@ func RegisterTagServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, }) + mux.Handle(""DELETE"", pattern_TagService_DeleteTag_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, ""/memos.api.v2.TagService/DeleteTag"", runtime.WithHTTPPathPattern(""/api/v2/tags"")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_TagService_DeleteTag_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_TagService_DeleteTag_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } var ( + pattern_TagService_UpsertTag_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{""api"", ""v2"", ""tags""}, """")) + pattern_TagService_ListTags_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{""api"", ""v2"", ""tags""}, """")) + + pattern_TagService_DeleteTag_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{""api"", ""v2"", ""tags""}, """")) ) var ( + forward_TagService_UpsertTag_0 = runtime.ForwardResponseMessage + forward_TagService_ListTags_0 = runtime.ForwardResponseMessage + + forward_TagService_DeleteTag_0 = runtime.ForwardResponseMessage ) diff --git a/proto/gen/api/v2/tag_service_grpc.pb.go b/proto/gen/api/v2/tag_service_grpc.pb.go index 64d4ae01bc1af..871ef1d40a264 100644 --- a/proto/gen/api/v2/tag_service_grpc.pb.go +++ b/proto/gen/api/v2/tag_service_grpc.pb.go @@ -19,14 +19,18 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - TagService_ListTags_FullMethodName = ""/memos.api.v2.TagService/ListTags"" + TagService_UpsertTag_FullMethodName = ""/memos.api.v2.TagService/UpsertTag"" + TagService_ListTags_FullMethodName = ""/memos.api.v2.TagService/ListTags"" + TagService_DeleteTag_FullMethodName = ""/memos.api.v2.TagService/DeleteTag"" ) // TagServiceClient is the client API for TagService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TagServiceClient interface { + UpsertTag(ctx context.Context, in *UpsertTagRequest, opts ...grpc.CallOption) (*UpsertTagResponse, error) ListTags(ctx context.Context, in *ListTagsRequest, opts ...grpc.CallOption) (*ListTagsResponse, error) + DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*DeleteTagResponse, error) } type tagServiceClient struct { @@ -37,6 +41,15 @@ func NewTagServiceClient(cc grpc.ClientConnInterface) TagServiceClient { return &tagServiceClient{cc} } +func (c *tagServiceClient) UpsertTag(ctx context.Context, in *UpsertTagRequest, opts ...grpc.CallOption) (*UpsertTagResponse, error) { + out := new(UpsertTagResponse) + err := c.cc.Invoke(ctx, TagService_UpsertTag_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *tagServiceClient) ListTags(ctx context.Context, in *ListTagsRequest, opts ...grpc.CallOption) (*ListTagsResponse, error) { out := new(ListTagsResponse) err := c.cc.Invoke(ctx, TagService_ListTags_FullMethodName, in, out, opts...) @@ -46,11 +59,22 @@ func (c *tagServiceClient) ListTags(ctx context.Context, in *ListTagsRequest, op return out, nil } +func (c *tagServiceClient) DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*DeleteTagResponse, error) { + out := new(DeleteTagResponse) + err := c.cc.Invoke(ctx, TagService_DeleteTag_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // TagServiceServer is the server API for TagService service. // All implementations must embed UnimplementedTagServiceServer // for forward compatibility type TagServiceServer interface { + UpsertTag(context.Context, *UpsertTagRequest) (*UpsertTagResponse, error) ListTags(context.Context, *ListTagsRequest) (*ListTagsResponse, error) + DeleteTag(context.Context, *DeleteTagRequest) (*DeleteTagResponse, error) mustEmbedUnimplementedTagServiceServer() } @@ -58,9 +82,15 @@ type TagServiceServer interface { type UnimplementedTagServiceServer struct { } +func (UnimplementedTagServiceServer) UpsertTag(context.Context, *UpsertTagRequest) (*UpsertTagResponse, error) { + return nil, status.Errorf(codes.Unimplemented, ""method UpsertTag not implemented"") +} func (UnimplementedTagServiceServer) ListTags(context.Context, *ListTagsRequest) (*ListTagsResponse, error) { return nil, status.Errorf(codes.Unimplemented, ""method ListTags not implemented"") } +func (UnimplementedTagServiceServer) DeleteTag(context.Context, *DeleteTagRequest) (*DeleteTagResponse, error) { + return nil, status.Errorf(codes.Unimplemented, ""method DeleteTag not implemented"") +} func (UnimplementedTagServiceServer) mustEmbedUnimplementedTagServiceServer() {} // UnsafeTagServiceServer may be embedded to opt out of forward compatibility for this service. @@ -74,6 +104,24 @@ func RegisterTagServiceServer(s grpc.ServiceRegistrar, srv TagServiceServer) { s.RegisterService(&TagService_ServiceDesc, srv) } +func _TagService_UpsertTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpsertTagRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TagServiceServer).UpsertTag(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: TagService_UpsertTag_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TagServiceServer).UpsertTag(ctx, req.(*UpsertTagRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _TagService_ListTags_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListTagsRequest) if err := dec(in); err != nil { @@ -92,6 +140,24 @@ func _TagService_ListTags_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } +func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteTagRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TagServiceServer).DeleteTag(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: TagService_DeleteTag_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TagServiceServer).DeleteTag(ctx, req.(*DeleteTagRequest)) + } + return interceptor(ctx, in, info, handler) +} + // TagService_ServiceDesc is the grpc.ServiceDesc for TagService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -99,10 +165,18 @@ var TagService_ServiceDesc = grpc.ServiceDesc{ ServiceName: ""memos.api.v2.TagService"", HandlerType: (*TagServiceServer)(nil), Methods: []grpc.MethodDesc{ + { + MethodName: ""UpsertTag"", + Handler: _TagService_UpsertTag_Handler, + }, { MethodName: ""ListTags"", Handler: _TagService_ListTags_Handler, }, + { + MethodName: ""DeleteTag"", + Handler: _TagService_DeleteTag_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: ""api/v2/tag_service.proto"", diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.ts index c68c679cd7754..1d44c1aa7cac9 100644 --- a/web/src/helpers/api.ts +++ b/web/src/helpers/api.ts @@ -155,26 +155,10 @@ export function deleteResourceById(id: ResourceId) { return axios.delete(`/api/v1/resource/${id}`); } -export function getTagList() { - return axios.get(`/api/v1/tag`); -} - export function getTagSuggestionList() { return axios.get(`/api/v1/tag/suggestion`); } -export function upsertTag(tagName: string) { - return axios.post(`/api/v1/tag`, { - name: tagName, - }); -} - -export function deleteTag(tagName: string) { - return axios.post(`/api/v1/tag/delete`, { - name: tagName, - }); -} - export function getStorageList() { return axios.get(`/api/v1/storage`); } diff --git a/web/src/store/module/tag.ts b/web/src/store/module/tag.ts index efad18dca3fe1..76044298b3d61 100644 --- a/web/src/store/module/tag.ts +++ b/web/src/store/module/tag.ts @@ -1,26 +1,45 @@ -import * as api from ""@/helpers/api""; +import { tagServiceClient } from ""@/grpcweb""; +import useCurrentUser from ""@/hooks/useCurrentUser""; import store, { useAppSelector } from ""..""; -import { deleteTag, setTags, upsertTag } from ""../reducer/tag""; +import { deleteTag as deleteTagAction, setTags, upsertTag as upsertTagAction } from ""../reducer/tag""; export const useTagStore = () => { const state = useAppSelector((state) => state.tag); + const currentUser = useCurrentUser(); + + const getState = () => { + return store.getState().tag; + }; + + const fetchTags = async () => { + const { tags } = await tagServiceClient.listTags({ + creatorId: currentUser.id, + }); + store.dispatch(setTags(tags.map((tag) => tag.name))); + }; + + const upsertTag = async (tagName: string) => { + await tagServiceClient.upsertTag({ + name: tagName, + }); + store.dispatch(upsertTagAction(tagName)); + }; + + const deleteTag = async (tagName: string) => { + await tagServiceClient.deleteTag({ + tag: { + name: tagName, + creatorId: currentUser.id, + }, + }); + store.dispatch(deleteTagAction(tagName)); + }; return { state, - getState: () => { - return store.getState().tag; - }, - fetchTags: async () => { - const { data } = await api.getTagList(); - store.dispatch(setTags(data)); - }, - upsertTag: async (tagName: string) => { - await api.upsertTag(tagName); - store.dispatch(upsertTag(tagName)); - }, - deleteTag: async (tagName: string) => { - await api.deleteTag(tagName); - store.dispatch(deleteTag(tagName)); - }, + getState, + fetchTags, + upsertTag, + deleteTag, }; };",chore,update tag service 011fcc7dd4a4807dfebdc0ac6e9df37a781142da,2022-06-27 19:39:06,boojack,chore: rename module,False,"diff --git a/api/system.go b/api/system.go index 66756a4d12bea..53d935027bc59 100644 --- a/api/system.go +++ b/api/system.go @@ -1,6 +1,6 @@ package api -import ""memos/server/profile"" +import ""github.com/usememos/memos/server/profile"" type SystemStatus struct { Owner *User `json:""owner""` diff --git a/bin/server/cmd/root.go b/bin/server/cmd/root.go index 9ff059de292db..ec52fffb7f44c 100644 --- a/bin/server/cmd/root.go +++ b/bin/server/cmd/root.go @@ -4,10 +4,10 @@ import ( ""fmt"" ""os"" - ""memos/server"" - ""memos/server/profile"" - ""memos/store"" - DB ""memos/store/db"" + ""github.com/usememos/memos/server"" + ""github.com/usememos/memos/server/profile"" + ""github.com/usememos/memos/store"" + DB ""github.com/usememos/memos/store/db"" ) const ( diff --git a/bin/server/main.go b/bin/server/main.go index 5c9f2063e39f2..6820963eb2f0a 100644 --- a/bin/server/main.go +++ b/bin/server/main.go @@ -1,6 +1,6 @@ package main -import ""memos/bin/server/cmd"" +import ""github.com/usememos/memos/bin/server/cmd"" func main() { cmd.Execute() diff --git a/go.mod b/go.mod index 5651b366055eb..94539d3d0b868 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module memos +module github.com/usememos/memos go 1.17 diff --git a/server/auth.go b/server/auth.go index 88517d2da7689..440c7a722652a 100644 --- a/server/auth.go +++ b/server/auth.go @@ -3,10 +3,11 @@ package server import ( ""encoding/json"" ""fmt"" - ""memos/api"" - ""memos/common"" ""net/http"" + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" + ""github.com/labstack/echo/v4"" ""golang.org/x/crypto/bcrypt"" ) diff --git a/server/basic_auth.go b/server/basic_auth.go index 3a8370daa6fd2..2976c6d6a53f0 100644 --- a/server/basic_auth.go +++ b/server/basic_auth.go @@ -2,11 +2,12 @@ package server import ( ""fmt"" - ""memos/api"" - ""memos/common"" ""net/http"" ""strconv"" + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" + ""github.com/gorilla/sessions"" ""github.com/labstack/echo-contrib/session"" ""github.com/labstack/echo/v4"" diff --git a/server/memo.go b/server/memo.go index 28896da4d307e..526a747af91f8 100644 --- a/server/memo.go +++ b/server/memo.go @@ -3,11 +3,12 @@ package server import ( ""encoding/json"" ""fmt"" - ""memos/api"" - ""memos/common"" ""net/http"" ""strconv"" + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" + ""github.com/labstack/echo/v4"" ) diff --git a/server/profile/profile.go b/server/profile/profile.go index 8c4f6f5766d85..8691bd738f42d 100644 --- a/server/profile/profile.go +++ b/server/profile/profile.go @@ -2,11 +2,12 @@ package profile import ( ""fmt"" - ""memos/common"" ""os"" ""path/filepath"" ""strconv"" ""strings"" + + ""github.com/usememos/memos/common"" ) // Profile is the configuration to start main server. diff --git a/server/resource.go b/server/resource.go index 6a708d06ac514..700329c30f88a 100644 --- a/server/resource.go +++ b/server/resource.go @@ -4,10 +4,11 @@ import ( ""encoding/json"" ""fmt"" ""io/ioutil"" - ""memos/api"" ""net/http"" ""strconv"" + ""github.com/usememos/memos/api"" + ""github.com/labstack/echo/v4"" ) diff --git a/server/server.go b/server/server.go index 91e5c974c525f..9f18ed18a87ea 100644 --- a/server/server.go +++ b/server/server.go @@ -2,10 +2,11 @@ package server import ( ""fmt"" - ""memos/server/profile"" - ""memos/store"" ""time"" + ""github.com/usememos/memos/server/profile"" + ""github.com/usememos/memos/store"" + ""github.com/gorilla/securecookie"" ""github.com/gorilla/sessions"" ""github.com/labstack/echo-contrib/session"" diff --git a/server/shortcut.go b/server/shortcut.go index dd1c9122a31db..bfdf5356fdc77 100644 --- a/server/shortcut.go +++ b/server/shortcut.go @@ -3,10 +3,11 @@ package server import ( ""encoding/json"" ""fmt"" - ""memos/api"" ""net/http"" ""strconv"" + ""github.com/usememos/memos/api"" + ""github.com/labstack/echo/v4"" ) diff --git a/server/system.go b/server/system.go index 06a97923af98a..04a82c8f85503 100644 --- a/server/system.go +++ b/server/system.go @@ -2,9 +2,10 @@ package server import ( ""encoding/json"" - ""memos/api"" ""net/http"" + ""github.com/usememos/memos/api"" + ""github.com/labstack/echo/v4"" ) diff --git a/server/tag.go b/server/tag.go index c6a94fab44212..17714ce343c0b 100644 --- a/server/tag.go +++ b/server/tag.go @@ -2,10 +2,11 @@ package server import ( ""encoding/json"" - ""memos/api"" ""net/http"" ""regexp"" + ""github.com/usememos/memos/api"" + ""github.com/labstack/echo/v4"" ) diff --git a/server/user.go b/server/user.go index 14cda7bd10207..f266b400c8467 100644 --- a/server/user.go +++ b/server/user.go @@ -3,11 +3,12 @@ package server import ( ""encoding/json"" ""fmt"" - ""memos/api"" - ""memos/common"" ""net/http"" ""strconv"" + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" + ""github.com/labstack/echo/v4"" ""golang.org/x/crypto/bcrypt"" ) diff --git a/server/webhook.go b/server/webhook.go index 5b5661c42a37e..0a5df07942bd0 100644 --- a/server/webhook.go +++ b/server/webhook.go @@ -4,10 +4,11 @@ import ( ""encoding/json"" ""fmt"" ""io/ioutil"" - ""memos/api"" ""net/http"" ""strconv"" + ""github.com/usememos/memos/api"" + ""github.com/labstack/echo/v4"" ) diff --git a/store/db/db.go b/store/db/db.go index 5eb432cc0c59d..482d41d0708a3 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -6,11 +6,12 @@ import ( ""errors"" ""fmt"" ""io/fs"" - ""memos/common"" - ""memos/server/profile"" ""os"" ""sort"" + ""github.com/usememos/memos/common"" + ""github.com/usememos/memos/server/profile"" + _ ""github.com/mattn/go-sqlite3"" ) diff --git a/store/memo.go b/store/memo.go index e99120c53a7b1..abd645ff2c345 100644 --- a/store/memo.go +++ b/store/memo.go @@ -3,9 +3,10 @@ package store import ( ""database/sql"" ""fmt"" - ""memos/api"" - ""memos/common"" ""strings"" + + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" ) // memoRaw is the store model for an Memo. diff --git a/store/memo_organizer.go b/store/memo_organizer.go index 2e5c39ac218ec..666dbbe475aff 100644 --- a/store/memo_organizer.go +++ b/store/memo_organizer.go @@ -3,8 +3,9 @@ package store import ( ""database/sql"" ""fmt"" - ""memos/api"" - ""memos/common"" + + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" ) // memoOrganizerRaw is the store model for an MemoOrganizer. diff --git a/store/resource.go b/store/resource.go index 230480d649e32..f22c78d71b00f 100644 --- a/store/resource.go +++ b/store/resource.go @@ -3,9 +3,10 @@ package store import ( ""database/sql"" ""fmt"" - ""memos/api"" - ""memos/common"" ""strings"" + + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" ) // resourceRaw is the store model for an Resource. diff --git a/store/shortcut.go b/store/shortcut.go index 0cd583c0692b3..ee0ec044612b7 100644 --- a/store/shortcut.go +++ b/store/shortcut.go @@ -3,9 +3,10 @@ package store import ( ""database/sql"" ""fmt"" - ""memos/api"" - ""memos/common"" ""strings"" + + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" ) // shortcutRaw is the store model for an Shortcut. diff --git a/store/store.go b/store/store.go index 442eadef4c58b..b7f7d8b2c253c 100644 --- a/store/store.go +++ b/store/store.go @@ -2,7 +2,8 @@ package store import ( ""database/sql"" - ""memos/server/profile"" + + ""github.com/usememos/memos/server/profile"" ) // Store provides database access to all raw objects diff --git a/store/user.go b/store/user.go index 559c255e578ed..19cd3689aa3c9 100644 --- a/store/user.go +++ b/store/user.go @@ -3,9 +3,10 @@ package store import ( ""database/sql"" ""fmt"" - ""memos/api"" - ""memos/common"" ""strings"" + + ""github.com/usememos/memos/api"" + ""github.com/usememos/memos/common"" ) // userRaw is the store model for an User.",chore,rename module b575064d47f8c0faf6f0c5b8a465f72244055593,2023-12-19 19:14:40,Steven,chore: tweak padding,False,"diff --git a/web/src/components/HomeSidebar.tsx b/web/src/components/HomeSidebar.tsx index 9461ae1dee3fe..714985c1de991 100644 --- a/web/src/components/HomeSidebar.tsx +++ b/web/src/components/HomeSidebar.tsx @@ -4,7 +4,7 @@ import UsageHeatMap from ""./UsageHeatMap""; const HomeSidebar = () => { return ( -