<2>DocSpace පරිපාලක
DocSpace වින්යාසගත කිරීම, කාමර සෑදීම සහ පරිපාලනය, DocSpace සහ අතත්ය කාමර වෙත පුද්ගලයින්ට ආරාධනය සහ කළමනාකරණය, ප්රවේශ අයිතීන් කළමනාකරණය.
<3>කාමර පරිපාලක
කාමර පරිපාලනය සහ සංරක්ෂණය, පුද්ගලයින්ට ආරාධනය සහ කළමනාකරණය. කාමරයකට පරිපාලකයින් කිහිප දෙනෙකු පත් කිරීමට හැකිය.
<4>බලවත් පරිශ්රීලක
බලවත් පරිශ්රීලකයින්ට කාමර තුළ ගොනු සෑදීමට සහ සංස්කරණයට හැකිය, නමුත් කාමර සෑදීමට, පරිශ්රීලකයින් කළමනාකරණයට හෝ සැකසුම් වෙත ප්රවේශ වීමට නොහැකිය.", + "UnsavedChangesBody": "ඔබ දැන් සබැඳි සැකසුම් වට්ටෝරුව වසා දැමුවහොත්, ඔබගේ වෙනස්කම් සුරැකෙන්නේ නැත.", + "UnsupportedFilesDescription": "සමහර උපස්ථ ගොනු සඳහා සහාය නොදක්වයි. සහාය නොදක්වන අථක ලැයිස්තුව බාගැනීමට \"සහාය නොදක්වන ගොනු බලන්න\" ඔබන්න", + "UnsupportedFilesWithUploadDesc": "සමහර උපස්ථ ගොනු සඳහා සහාය නොදක්වයි. සහාය නොදක්වන අථක ලැයිස්තුව බාගැනීමට \"සහාය නොදක්වන ගොනු බලන්න\" ඔබන්න හෝ ඒවා නැතිව ඉදිරියට යාමට \"සේවාදායකයට උඩුගත කරන්න\" ඔබන්න.", + "UpdatingStatistics": "සංඛ්යාලේඛන යාවත්කාල වීමට බොහෝ කාලයක් ගත විය හැකිය", + "UploadBackupData": "සංක්රමණය ඇරඹීමට පහත කැමති සේවාවකින් උපස්ථ පිටපතක් උඩුගත කරන්න.", + "UploadToServer": "සේවාදායකයට උඩුගත කරන්න", "UseAsLogoButton": "ලාංඡනය ලෙස යොදන්න", "UseDigits": "අංක භාවිතා කරන්න", + "UsedStorage": "භාවිතය: {{size}}", "UseHttp": "Http භාවිතා කරන්න", "UserAgreement": "මම තහවුරු කරමි. ඉදිරියට යාමට වුවමනාය.", + "UserLimitExceeded": "පරිශ්රීලකයින් සීමාව ඉක්මවා ඇත. ඊළඟ පියවරට යාමට කරුණාකර පරිශ්රීලකයින් ගණන වෙනස් කරන්න හෝ DocSpace පරිශ්රීලකයින් සීමාව වැඩි කරන්න.", + "UsersSectionDescription": "\"පරිශ්රීලකයින්\" කොටසට ඔබ කලින් පියවරේ දී තෝරාගත් පරිශ්රීලකයින් ඇතුළත් වේ. පෙරනිමි පරිදි එය සැමවිටම සබල අතර තේරීම ඉවතලීමට නොහැකිය.", "UseSpecialChar": "විශේෂ අකුරු භාවිතා කරන්න", "UseUpperCase": "ලොකුකුරු භාවිතා කරන්න", + "WantToCancelDataImport": "ඔබට දත්ත ආයාතය අවලංගු කිරීමට වුවමනාද?", + "WantToCancelUpload": "ඔබට උඩුගත කිරීම අවලංගු කිරීමට වුවමනාද?", "WhiteLabel": "ලාංඡනයේ සැකසුම්", "WhiteLabelHelper": "පාරදෘශ්ය පසුබිමක් සහිත රූප භාවිතා කරන්න. (PNG, SVG, JPG)", "WhiteLabelSubtitle": "ඔබගේ සමාගමේ නම යොදන්න, ලාංඡනය උඩුගත කරන්න සහ ඔබගේ සන්නාමයට ගැළපෙන පරිදි රටාව අභිරුචිකරණය කරන්න.", "WhiteLabelTooltip": "රෙටීනා සංදර්ශක සඳහා ප්රමාණ පෙන්වයි. සම්මත විභේදන සහිත සංදර්ශක සඳහා උඩුගත කිරීමේදී ලාංඡනයේ පළල සහ උස ඊට අනුරූපව යළි ප්රමාණනය කෙරේ.", + "WithoutEmailHint": "ඔබට වි-තැපෑලක් රහිත පරිශ්රීලකයින් නැත. කරුණාකර ඊළඟ පියවරට යන්න.", "YouHaveUnsavedChanges": "ඔබ සතුව නොසුරැකි වෙනස්කම් ඇත", "YourCurrentDomain": "ඔබගේ වත්මන් වසම" } diff --git a/packages/client/public/locales/si/SharingPanel.json b/packages/client/public/locales/si/SharingPanel.json index 4bf3daee37..b9606e12ff 100644 --- a/packages/client/public/locales/si/SharingPanel.json +++ b/packages/client/public/locales/si/SharingPanel.json @@ -1,6 +1,7 @@ { "ExternalLink": "බාහිර සබැඳිය", "FormFilling": "ආකෘතිපත්ර පිරවීම", + "LinkName": "සබැඳියේ නම", "ShareEmailBody": "ඔබට {{itemName}} ලේඛනයට ප්රවේශය ලබා දී ඇත. දැන් ලේඛනය ඇරීමට පහත සබැඳිය ඔබන්න: {{shareLink}}.", "ShareEmailSubject": "ඔබට {{itemName}} ලේඛනයට ප්රවේශය ලබා දී ඇත", "SharingSettingsTitle": "බෙදාගැනීමේ සැකසුම්" diff --git a/packages/client/public/locales/si/SingleSignOn.json b/packages/client/public/locales/si/SingleSignOn.json index 6b99f5b682..75c63674ad 100644 --- a/packages/client/public/locales/si/SingleSignOn.json +++ b/packages/client/public/locales/si/SingleSignOn.json @@ -32,6 +32,7 @@ "ProviderURL": "IdP හැඳු.", "ProviderURLTooltip": "අනන්යතා ප්රතිපාදකයාගේ හැඳු. (නිකුත්කරුගේ ඒ.ස.නි.).", "ServiceProviderSettings": "ඔන්ලිඔෆිස් SP සැකසුම්", + "ServiceProviderSettingsDescription": "සේවා ප්රතිපාදක සැකසුම් වින්යාස කර තනි පිවිසුම (SSO) සඳහා SP සහතික එක් කරන්න.", "Show": "පෙන්වන්න", "ShowAdditionalParameters": "වැඩිදුර සැකසුම් පෙන්වන්න", "Signing": "අත්සන් තැබීම", @@ -47,6 +48,7 @@ "SPEntityId": "SP හැඳු. (පාරදත්ත XML වෙත සබැඳියි)", "SPEntityIdTooltip": "අනන්යතා ප්රතිපාදකයාට නිශ්චිතව SP හඳුනා ගැනීමට සේවා ප්රතිපාදකයාගේ XML ඒ.ස.නි. ලිපිනය බාගත කර භාවිතා කිරීමට හැකිය", "SpMetadata": "ඔන්ලිඔෆිස් SP පාරදත්ත", + "SpMetadataDescription": "ඔබගේ IdP ගිණුමට විශ්වසන සේවා ප්රතිපාදකයෙක් ලෙස ඔන්ලිඔෆිස් DocSpace එක් කිරීමට සේවා ප්රතිපාදකයාගේ පාරදත්ත වෙත ප්රවේශ වන්න.", "spSignExitRequest": "නික්මීමේ ඉල්ලීම් අත්සන් තබන්න", "spSigningAlgorithm": "අත්සන් ඇල්ගොරිතම", "spSignResponseRequest": "නික්මීමේ ප්රතිචාර අත්සන් තබන්න", diff --git a/packages/client/public/locales/si/Translations.json b/packages/client/public/locales/si/Translations.json index 5c4f033406..979c174e20 100644 --- a/packages/client/public/locales/si/Translations.json +++ b/packages/client/public/locales/si/Translations.json @@ -22,11 +22,13 @@ "FolderTitleYandex": "යාන්ඩෙක්ස් නාමාවලිය", "FormTemplates": "ආකෘතිපත්ර අච්චු", "LinkCopySuccess": "සබැඳිය පසුරුපුවරුවට පිටපත් විය", + "LinkHasExpiredAndHasBeenDisabled": "සබැඳිය කල් ඉකුත් වී අබල කර ඇත", "LinkValidTime": "මෙම සබැඳිය දවස් {{days_count}}කට වලංගුය.", "NewForm": "ආකෘතිපත්ර අච්චුව", "Other": "වෙනත්", "OwnerChange": "හිමිකරු සංශෝධනය", "Presentations": "සමර්පණ", + "PublicRoomLinkValidTime": "මෙම සබැඳිය {{date}} දක්වා වලංගු වේ. කල් ඉකුත් වූ පසු සබැඳියෙන් කාමරයට ප්රවේශ වීමට නොහැකි වනු ඇත.", "RoleCommentator": "අදහස් දක්වන්නා", "RoleCommentatorDescription": "පවතින ගොනුවල මෙහෙයුම්: බැලීම්, අදහස් දැක්වීම්.", "RoleDocSpaceAdminDescription": "DocSpace පරිපාලකයින්ට DocSpace සැකසුම් වෙත ප්රවේශ වීමට, කාමර කළමනාකරණයට සහ සංරක්ෂණයට, නව පරිශ්රීලකයින්ට ආරාධනයට මෙන්ම තමන්ගේ මට්ටමට වඩා අඩු භූමිකාවන් පැවරීමට හැකිය. සියළුම පරිපාලකයින්ට පෞද්ගලික අංශයට ප්රවේශය ඇත.", @@ -40,6 +42,7 @@ "RoleUserDescription": "පරිපාලකයින් ආරාධනා කරනු ලබන කාමරවලට පමණක් පරිශ්රීලකයින්ට ප්රවේශ වීමට හැකිය. ඔවුන්ට තමන්ගේම කාමර, බහාලුම් හෝ ගොනු සෑදීමට නොහැකිය.", "RoleViewer": "දකින්නා", "RoleViewerDescription": "ගොනු දැකීම", + "SearchByHeadOfGroup": "සමූහ ප්රධානීන් අනුව සොයන්න", "SearchByOwner": "හිමිකරු අනුව සොයන්න", "Spreadsheets": "පැතුරුම්පත්", "SubNewForm": "හිස්", diff --git a/packages/client/public/locales/si/WebPlugins.json b/packages/client/public/locales/si/WebPlugins.json index 3d29f275fa..1a1a7a9ad2 100644 --- a/packages/client/public/locales/si/WebPlugins.json +++ b/packages/client/public/locales/si/WebPlugins.json @@ -1,3 +1,16 @@ { - "Metadata": "පාරදත්ත" + "DeletePlugin": "පේනුව මකන්න", + "DeletePluginDescription": "පේනුව තවදුරටත් DocSpace පරිශ්රීලකයින්ට නොලැබෙනු ඇත. ඔබට ඉදිරියට යාමට වුවමනා ද?", + "DeletePluginTitle": "පේනුව මකන්නද?", + "ExpandFunctionality": "පේනු SDK භාවිතා කර පුළුල් ක්රියාකාරීත්වයක් අත්විඳින්න", + "GoToRepo": "කෝෂ්ඨය වෙත යන්න", + "Metadata": "පාරදත්ත", + "NeedSettings": "සැකසුම් යෙදිය යුතුය", + "NoPlugins": "පේනු නැත", + "NotNeedSettings": "සැකසුම් අනවශ්යයි", + "PluginSamples": "ආදර්ශ පේනු", + "PluginSDK": "පේනු SDK", + "PluginSDKDescription": "පේනු SDK භාවිතයෙන් ඔබගේ DocSpace ක්රියාකාරීත්වය විස්තීරණයට, තෙවන පාර්ශ්ව සේවා සම්බන්ධ කිරීමට හෝ වත්මන් පරිශ්රීලක අත්දැකීම ඉහළ නැංවීමට හැකිය. කේත මූලාශ්ර සහිත පේනු ආදර්ශ ඔබට ගිට්හබ් හි හමු වනු ඇත.", + "PluginSDKInstruction": "ඔබගේම පේනු සාදා ගන්නේ කෙසේදැයි පිළිබඳ සවිස්තරාත්මක උපදෙස් සඳහා බොත්තම ඔබන්න.", + "UploadDescription": "අමතර විශේෂාංග සමඟ DocSpace ක්රියාකාරීත්වය විස්තීරණයට පේනු එක් කිරීමට හැකිය. පේනු උඩුගත කරන්න එබීමෙන් අනතුරුව ZIP හැකිළුමේ අඩංගු පේනුවේ ගොනුව තෝරන්න" } diff --git a/packages/client/public/locales/si/Webhooks.json b/packages/client/public/locales/si/Webhooks.json index 0967ef424b..3ddb02e538 100644 --- a/packages/client/public/locales/si/Webhooks.json +++ b/packages/client/public/locales/si/Webhooks.json @@ -1 +1,59 @@ -{} +{ + "Before": "පෙර", + "CreateWebhook": "webhook සාදන්න", + "DeleteHint": "webhook සදහටම මැකෙනු ඇත.\nමෙම ක්රියාමාර්ගය අප්රතිවර්ත්යයි.", + "DeleteWebhook": "webhook මකන්න", + "DeleteWebhookForeverQuestion": "webhook සදහටම මකන්නද?", + "Delivery": "බාරදීම", + "DeliveryDate": "බාරදෙන දිනය", + "DisableSSL": "අබල කරන්න (නිර්දේශ නොකරයි)", + "EnableSSL": "SSL සත්යාපනය සබල කරන්න", + "EnterSecretKey": "රහස් යතුර යොදන්න", + "EnterUrl": "ඒ.ස.නි. යොදන්න", + "EnterWebhookName": "webhook නම යොදන්න", + "EventHint": "දවස් 15 කට පසු බාරදීම් ස්වයංක්රීයව මකා දමනු ලැබේ", + "EventID": "සිදුවීමේ හැඳු.", + "FailedToConnect": "අපට මෙම payload බාරදීමට නොහැකි විය: සත්කාරකයට සම්බන්ධ වීමට අසමත් විය", + "From": "වෙතින්", + "Generate": "උත්පාදනය", + "NoResultsMatched": "මෙම පෙරහනට ගැළපෙන ප්රතිඵල නැත. සියලුම අථක බැලීමට පෙරහන හිස් කරන්න.", + "NotSent": "නොයැවිණි", + "PayloadIsTooLarge": "මෙම payload පෙන්වීමට විශාල වැඩිය.", + "PayloadUrl": "payload ඒ.ස.නි.", + "ReadMore": "තව කියවන්න", + "Request": "ඉල්ලීම", + "RequestBodyCopied": "POST ඉල්ලීමේ අන්තර්ගතය පසුරු පුවරුවට පිටපත් විය", + "RequestHeaderCopied": "POST ඉල්ලීමේ ශ්රීර්ෂකය පසුරු පුවරුවට පිටපත් විය", + "RequestPostBody": "POST ඉල්ලීමේ අන්තර්ගතය", + "RequestPostHeader": "POST ඉල්ලීමේ ශ්රීර්ෂකය", + "ResetKey": "යතුර යළි සකසන්න", + "Response": "ප්රතිචාරය", + "ResponseBodyCopied": "POST ප්රතිචාරයේ අන්තර්ගතය පසුරු පුවරුවට පිටපත් විය", + "ResponseHeaderCopied": "POST ප්රතිචාරයේ ශ්රීර්ෂකය පසුරු පුවරුවට පිටපත් විය", + "ResponsePostBody": "POST ප්රතිචාරයේ අන්තර්ගතය", + "ResponsePostHeader": "POST ප්රතිචාරයේ ශ්රීර්ෂකය", + "Retry": "නැවත", + "SecretKey": "රහස් යතුර", + "SecretKeyHint": "webhook රහසක් සැකසීමෙන් ඔබට payload ඒ.ස.නි. වෙත යවන ලද ඉල්ලීම් සත්යාපනය කර ගැනීමට හැකිය.", + "SecretKeyWarning": "ඔබගේ රහස් යතුර සුරැකීමෙන් පසු නැවත ලබා ගැනීමට නොහැකිය. මෙම රහස් යතුර නැති වී හෝ අමතක වී ඇත්නම්, ඔබට එය නැවත සැකසීමට හැකිය. නමුත් මෙම රහස භාවිතා කරන සියලුම අනුකලන යාවත්කාල කිරීමට සිදු වනු ඇත.", + "SelectDate": "දිනයක් තෝරන්න", + "SelectDeliveryTime": "බාරදෙන වේලාව තෝරන්න", + "SettingsWebhook": "webhook සැකසුම්", + "SSLHint": "පෙරනිමි පරිදි අපි payloads බාරදීමේ දී SSL සහතික සත්යාපනය කරන්නෙමු.", + "SSLVerification": "SSL සත්යාපනය", + "State": "තත්වය", + "UnselectAll": "සියල්ල නොතෝරන්න", + "URL": "ඒ.ස.නි.", + "ViewRawPayload": "අමු payload බලන්න", + "WebhookCreated": "Webhook සෑදිණි", + "WebhookCreationHint": "DocSpace හි සියලුම සිදුවීම් මෙම webhook වෙත පවරනු ලැබේ", + "WebhookDetails": "Webhook විස්තර", + "WebhookEditedSuccessfully": "Webhook වින්යාසය සංශෝධනය කෙරිණි", + "WebhookHistory": "Webhook ඉතිහාසය", + "WebhookName": "Webhook නම", + "WebhookRedilivered": "Webhook යළි බාරදුණි", + "WebhookRemoved": "Webhook ඉවත් කෙරිණි", + "Webhooks": "Webhooks", + "WebhooksGuide": "Webhooks මාර්ගෝපදේශය", + "WebhooksInfo": "ඔන්ලිඔෆිස් DocSpace හි විවිධ සිදුවීම් මත පදනම්ව ඔබ භාවිතා කරන ඕනෑම යෙදුමක හෝ අඩවියක පසකින් අභිරුචි ක්රියා සිදු කිරීමට webhooks භාවිතා කරන්න.\nමෙහි ඔබට සියලුම webhooks සාදා කළමනාකරණයට, වින්යාස කිරීමට සහ webhook වල ඉතිහාසය පිරික්සීමෙන් ඒවායේ කාර්ය සාධනය විගණනය කිරීමට හැකිය. " +} diff --git a/packages/client/public/locales/sk/ConnectDialog.json b/packages/client/public/locales/sk/ConnectDialog.json index 0aa7fd5e32..3f67eba3d6 100644 --- a/packages/client/public/locales/sk/ConnectDialog.json +++ b/packages/client/public/locales/sk/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "Účet", "ConnectFolderTitle": "Názov priečinka", "ConnectionUrl": "URL adresa pripojenia", "Login": "Prihlásiť sa", "SuccessfulConnectionOfAThirdParty": "Služba od tretej strany bola úspešne pripojená." -} \ No newline at end of file +} diff --git a/packages/client/public/locales/sk/Errors.json b/packages/client/public/locales/sk/Errors.json index cd6bbe8e74..0649c66a1a 100644 --- a/packages/client/public/locales/sk/Errors.json +++ b/packages/client/public/locales/sk/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "Prázdna odpoveď", "ErrorUnavailableText": "DocSpace je nedostupný", - "InvalidLink": "Neplatný odkaz", "LinkDoesNotExist": "Odkaz, ktorý sa pokúšate otvoriť, neexistuje.", "LinkHasExpired": "Odkaz, ktorý používate, je neplatný." } diff --git a/packages/client/public/locales/sk/Files.json b/packages/client/public/locales/sk/Files.json index 5d3b614b06..593fc2b8c1 100644 --- a/packages/client/public/locales/sk/Files.json +++ b/packages/client/public/locales/sk/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "Miestnosť je odopnutá", "SearchByContent": "Vyhľadávanie podľa obsahu súboru", "SendByEmail": "Poslať e-mailom", - "Share": "Zdieľať", "ShareFolder": "Zdieľať priečinok", "ShareFolderDescription": "Bude vytvorená nová miestnosť a skopíruje sa do nej celý obsah vybraného priečinka. Následne môžete pozvať ďalších používateľov na spoluprácu na súboroch v danej miestnosti.", "ShareRoom": "Zdieľať miestnosť", diff --git a/packages/client/public/locales/sl/ConnectDialog.json b/packages/client/public/locales/sl/ConnectDialog.json index 820e585dc6..6e0cb16ff4 100644 --- a/packages/client/public/locales/sl/ConnectDialog.json +++ b/packages/client/public/locales/sl/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "Račun", "ConnectFolderTitle": "Naslov mape", "ConnectionUrl": "Url povezave", "Login": "Prijava", "SuccessfulConnectionOfAThirdParty": "Storitev tretje osebe je bila uspešno povezana." -} \ No newline at end of file +} diff --git a/packages/client/public/locales/sl/Errors.json b/packages/client/public/locales/sl/Errors.json index 9bd40215f7..8d7c38eda8 100644 --- a/packages/client/public/locales/sl/Errors.json +++ b/packages/client/public/locales/sl/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "Prazen odziv", "ErrorUnavailableText": "DocSpace ni na voljo", - "InvalidLink": "Neveljavna povezava", "LinkDoesNotExist": "Povezava, ki jo poskušate odpreti, ne obstaja.", "LinkHasExpired": "Povezava, ki ste ji sledili, je potekla." } diff --git a/packages/client/public/locales/sl/Files.json b/packages/client/public/locales/sl/Files.json index 124c78640a..c69514e275 100644 --- a/packages/client/public/locales/sl/Files.json +++ b/packages/client/public/locales/sl/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "Soba odpeta", "SearchByContent": "Išči po vsebini datotek", "SendByEmail": "Pošlji po email", - "Share": "Deli", "ShareFolder": "Deljena mapa", "ShareFolderDescription": "Ustvarila se bo nova soba in vanjo bo kopirana vsa vsebina izbrane mape. Nato lahko druge uporabnike povabite k sodelovanju pri datotekah v sobi.", "ShareRoom": "Deli sobo", diff --git a/packages/client/public/locales/sr-Latn-RS/ConnectDialog.json b/packages/client/public/locales/sr-Latn-RS/ConnectDialog.json index 05e47fb65e..1e365e23eb 100644 --- a/packages/client/public/locales/sr-Latn-RS/ConnectDialog.json +++ b/packages/client/public/locales/sr-Latn-RS/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "Nalog", "ConnectFolderTitle": "Naslov foldera", "ConnectionUrl": "URL veze", "Login": "Prijava", "SuccessfulConnectionOfAThirdParty": "Usluga treće strane je uspešno povezana." -} \ No newline at end of file +} diff --git a/packages/client/public/locales/sr-Latn-RS/Errors.json b/packages/client/public/locales/sr-Latn-RS/Errors.json index c88d1b9a83..3c3a3fe258 100644 --- a/packages/client/public/locales/sr-Latn-RS/Errors.json +++ b/packages/client/public/locales/sr-Latn-RS/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "Prazan odgovor", "ErrorUnavailableText": "DocSpace nedostupan", - "InvalidLink": "Nevažeći link", "LinkDoesNotExist": "Link koji pokušavate da otvorite ne postoji.", "LinkHasExpired": "Link koji ste pratili je istekao." } diff --git a/packages/client/public/locales/sr-Latn-RS/Files.json b/packages/client/public/locales/sr-Latn-RS/Files.json index c15dee15dc..6b21f0c787 100644 --- a/packages/client/public/locales/sr-Latn-RS/Files.json +++ b/packages/client/public/locales/sr-Latn-RS/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "Sobe otkačene", "SearchByContent": "Pretražuj po sadržaju datoteke", "SendByEmail": "Pošalji putem email-a", - "Share": "Deli", "ShareFolder": "Deli folder", "ShareFolderDescription": "Nova soba će biti kreirana i sav sadržaj izabranog foldera će biti kopiran tamo. Nakon toga, možete pozvati druge korisnike da sarađuju na datotekama u sobi.", "ShareRoom": "Deli sobu", diff --git a/packages/client/public/locales/tr/ConnectDialog.json b/packages/client/public/locales/tr/ConnectDialog.json index b4a02d32a8..bff9198381 100644 --- a/packages/client/public/locales/tr/ConnectDialog.json +++ b/packages/client/public/locales/tr/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "Hesap", "ConnectFolderTitle": "Klasör başlığı", "ConnectionUrl": "Bağlantı url'si", "Login": "Giriş", "SuccessfulConnectionOfAThirdParty": "Üçüncü taraf hizmeti başarıyla bağlandı." -} \ No newline at end of file +} diff --git a/packages/client/public/locales/tr/Errors.json b/packages/client/public/locales/tr/Errors.json index ac5281dae7..ef583883df 100644 --- a/packages/client/public/locales/tr/Errors.json +++ b/packages/client/public/locales/tr/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "Boş yanıt", "ErrorUnavailableText": "DocSpace kullanılamıyor", - "InvalidLink": "Geçersiz bağlantı", "LinkDoesNotExist": "Açmaya çalıştığınız bağlantı mevcut değil.", "LinkHasExpired": "Takip ettiğiniz bağlantının süresi doldu." } diff --git a/packages/client/public/locales/tr/Files.json b/packages/client/public/locales/tr/Files.json index 75a7a634f9..df013ced8c 100644 --- a/packages/client/public/locales/tr/Files.json +++ b/packages/client/public/locales/tr/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "Odanın sabitlemesi kaldırıldı", "SearchByContent": "Dosya içeriğine göre ara", "SendByEmail": "E-posta ile gönder", - "Share": "Paylaş", "ShareFolder": "Klasörü paylaş", "ShareFolderDescription": "Yeni bir oda oluşturulacak ve seçilen klasörün tüm içeriği buraya kopyalanacaktır. Daha sonra, diğer kullanıcıları bir oda içindeki dosyalar üzerinde iş birliği yapmaya davet edebilirsiniz.", "ShareRoom": "Odayı paylaş", diff --git a/packages/client/public/locales/uk-UA/ConnectDialog.json b/packages/client/public/locales/uk-UA/ConnectDialog.json index fd3b3b932b..7db63d3c74 100644 --- a/packages/client/public/locales/uk-UA/ConnectDialog.json +++ b/packages/client/public/locales/uk-UA/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "Обліковий запис", "ConnectFolderTitle": "Заголовок папки", "ConnectionUrl": "URL-адреса підключення", "Login": "Вхід", "SuccessfulConnectionOfAThirdParty": "Сторонню службу успішно підключено." -} \ No newline at end of file +} diff --git a/packages/client/public/locales/uk-UA/Errors.json b/packages/client/public/locales/uk-UA/Errors.json index 5d904825df..0d2b3c18e5 100644 --- a/packages/client/public/locales/uk-UA/Errors.json +++ b/packages/client/public/locales/uk-UA/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "Пуста відповідь", "ErrorUnavailableText": "DocSpace недоступний", - "InvalidLink": "Недійсне посилання", "LinkDoesNotExist": "Посилання, яке ви намагаєтеся відкрити, не існує.", "LinkHasExpired": "Термін дії посилання, за яким ви перейшли, закінчився." } diff --git a/packages/client/public/locales/uk-UA/Files.json b/packages/client/public/locales/uk-UA/Files.json index 5d9f7dcd8a..f2aec0d005 100644 --- a/packages/client/public/locales/uk-UA/Files.json +++ b/packages/client/public/locales/uk-UA/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "Кімнату відкріплено", "SearchByContent": "Пошук за вмістом файлу", "SendByEmail": "Надіслати ел. поштою", - "Share": "Надати спільний доступ", "ShareFolder": "Спільний доступ до папки", "ShareFolderDescription": "Буде створено нову кімнату, і весь вміст вибраної папки буде скопійовано туди. Після цього ви зможете запрошувати інших користувачів до спільної роботи над файлами в кімнаті.", "ShareRoom": "Поділитися кімнатою", diff --git a/packages/client/public/locales/vi/ConnectDialog.json b/packages/client/public/locales/vi/ConnectDialog.json index 92eec24301..1415453c13 100644 --- a/packages/client/public/locales/vi/ConnectDialog.json +++ b/packages/client/public/locales/vi/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "Tài khoản", "ConnectFolderTitle": "Tiêu đề thư mục ", "ConnectionUrl": "Url kết nối", "Login": "Đăng nhập", "SuccessfulConnectionOfAThirdParty": "Dịch vụ của bên thứ ba đã được kết nối thành công." -} \ No newline at end of file +} diff --git a/packages/client/public/locales/vi/Errors.json b/packages/client/public/locales/vi/Errors.json index 004e6af5b8..f94a79575c 100644 --- a/packages/client/public/locales/vi/Errors.json +++ b/packages/client/public/locales/vi/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "Không có hồi đáp", "ErrorUnavailableText": "DocSpace không khả dụng", - "InvalidLink": "Liên kết không hợp lệ", "LinkDoesNotExist": "Liên kết bạn đang cố gắng mở không tồn tại.", "LinkHasExpired": "Liên kết bạn theo dõi đã hết hạn." } diff --git a/packages/client/public/locales/vi/Files.json b/packages/client/public/locales/vi/Files.json index 9f37bc9fbc..3b9a9ef8ee 100644 --- a/packages/client/public/locales/vi/Files.json +++ b/packages/client/public/locales/vi/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "Phòng đã hủy ghim", "SearchByContent": "Tìm kiếm theo nội dung tập tin", "SendByEmail": "Gửi qua email", - "Share": "Chia sẻ", "ShareFolder": "Chia sẻ thư mục", "ShareFolderDescription": "Một phòng mới sẽ được tạo và tất cả nội dung của thư mục đã chọn sẽ được sao chép vào đó. Sau đó, bạn có thể mời những người dùng khác cộng tác trên các tập tin trong phòng.", "ShareRoom": "Chia sẻ phòng", diff --git a/packages/client/public/locales/zh-CN/ConnectDialog.json b/packages/client/public/locales/zh-CN/ConnectDialog.json index d2e3cbca28..d3f3593d20 100644 --- a/packages/client/public/locales/zh-CN/ConnectDialog.json +++ b/packages/client/public/locales/zh-CN/ConnectDialog.json @@ -1,7 +1,7 @@ -{ +{ "Account": "账户", "ConnectFolderTitle": "文件夹标题", "ConnectionUrl": "连接URL", "Login": "登录", "SuccessfulConnectionOfAThirdParty": "第三方服务已成功连接。" -} \ No newline at end of file +} diff --git a/packages/client/public/locales/zh-CN/CreateEditRoomDialog.json b/packages/client/public/locales/zh-CN/CreateEditRoomDialog.json index e05513a460..a03f14f15e 100644 --- a/packages/client/public/locales/zh-CN/CreateEditRoomDialog.json +++ b/packages/client/public/locales/zh-CN/CreateEditRoomDialog.json @@ -17,7 +17,7 @@ "MakeRoomPrivateTitle": "将房间设为私密", "PeopleSelectorInfo": "只有房间管理员或协作空间管理员才能成为房间的所有者", "PublicRoomBarDescription": "所有人都可以通过链接进入此房间。外部用户拥有“仅查看”权限，可查看所有文件", - "PublicRoomDescription": "邀请用户通过外部链接查看文档，无需注册。您也可以将此房间嵌入任意网络界面。", + "PublicRoomDescription": "通过外部链接，邀请其他用户查看文档而无需注册。您也可以将此类房间嵌入任意的网络界面。", "PublicRoomSystemFoldersDescription": "不同完成阶段的表单副本存储在“系统”文件夹中。正在填写的表单存储在“处理中”文件夹中，填写完成的表单存储在“完成”文件夹中。", "PublicRoomSystemFoldersTitle": "系统文件夹", "ReviewRoomDescription": "请求审阅或评论文档", diff --git a/packages/client/public/locales/zh-CN/Errors.json b/packages/client/public/locales/zh-CN/Errors.json index 25e2bb7805..2946fc4dbc 100644 --- a/packages/client/public/locales/zh-CN/Errors.json +++ b/packages/client/public/locales/zh-CN/Errors.json @@ -1,7 +1,6 @@ { "ErrorEmptyResponse": "空响应", "ErrorUnavailableText": "协作空间不可用", - "InvalidLink": "无效链接", "LinkDoesNotExist": "链接不存在。", "LinkHasExpired": "您关注的链接已过期。" } diff --git a/packages/client/public/locales/zh-CN/Files.json b/packages/client/public/locales/zh-CN/Files.json index 44b8ed255a..73963fdcf3 100644 --- a/packages/client/public/locales/zh-CN/Files.json +++ b/packages/client/public/locales/zh-CN/Files.json @@ -158,7 +158,6 @@ "RoomUnpinned": "房间已取消置顶", "SearchByContent": "按文件内容搜索", "SendByEmail": "通过邮件发送", - "Share": "分享", "ShareFolder": "共享文件夹", "ShareFolderDescription": "系统会创建一个新房间，并将所选文件夹的所有内容复制到其中。之后，您可以邀请其他用户在房间内协作处理文件。", "ShareRoom": "分享房间", diff --git a/packages/client/public/locales/zh-CN/JavascriptSdk.json b/packages/client/public/locales/zh-CN/JavascriptSdk.json index 9ccdf73151..068df20423 100644 --- a/packages/client/public/locales/zh-CN/JavascriptSdk.json +++ b/packages/client/public/locales/zh-CN/JavascriptSdk.json @@ -33,8 +33,8 @@ "DefaultColumnsOption": "默认（数量取决于屏幕宽度）", "Descending": "降序", "DisplayColumns": "显示文件行中的列", - "DocspaceDescription": "嵌入整个协作空间，以支持用户与所有房间、文件和设置交互。", - "EditorDescription": "嵌入编辑器，以支持用户通过对应的间编辑文件。", + "DocspaceDescription": "嵌入整个协作空间，让用户能够与所有房间、文件和设置进行交互。", + "EditorDescription": "嵌入编辑器，让用户能够从对应的房间编辑文件。", "ElementCalledAfterClicking": "点击后元素会被调用", "ElementItself": "元素本身", "EmbedCodeSuccessfullyCopied": "获取要插入的代码", @@ -48,7 +48,7 @@ "FileId": "文件 ID", "FilePreview": "文件预览", "FileSelector": "文件选择器", - "FileSelectorDescription": "嵌入文件选择器，以支持用户访问可用文件列表中的任意文件。", + "FileSelectorDescription": "嵌入文件选择器，让用户能够访问允许列表中的文件。", "FilesSearchDescription": "在打开的文件夹/房间内搜索文件。", "FileTypeDisplay": "文件类型显示", "FrameId": "帧 ID", @@ -76,13 +76,13 @@ "MenuDescription": "如果用户不需要进入其他板块，您可以关闭左侧菜单。", "MobileOnly": "仅移动设备", "Page": "显示页面（页数）", - "PublicRoomDescription": "嵌入公共房间，支持用户无需注册即可查看其中储存的所有文档。", + "PublicRoomDescription": "嵌入公共房间，让用户无需注册即可查看公共房间中的所有文档。", "RightPanelCollapsed": "右侧面板已收起", "RoomOrFolder": "房间或文件夹", "RoomOrFolderDescription": "可选择要显示的板块、房间或文件夹", "RoomPreview": "房间预览", "RoomSelector": "房间选择器", - "RoomSelectorDescription": "嵌入房间选择器，支持用户访问可用房间列表中的任意房间。", + "RoomSelectorDescription": "嵌入房间选择器，让用户能够访问允许列表中的房间。", "RoomTypeDisplay": "房间类型显示", "Rotate": "旋转", "Scale": "缩放", @@ -104,5 +104,5 @@ "SubtitleDescription": "包含当前目录的附加注释或描述的副标题。", "TabPlugins": "选项卡插件", "Viewer": "查看器", - "ViewerDescription": "嵌入查看器，以支持用户打开文件，通过对应的房间查看。" + "ViewerDescription": "嵌入查看器，让用户能够从对应的房间打开文件并进行查看。" } diff --git a/packages/client/public/locales/zh-CN/Settings.json b/packages/client/public/locales/zh-CN/Settings.json index 5535b65d04..58b81838d7 100644 --- a/packages/client/public/locales/zh-CN/Settings.json +++ b/packages/client/public/locales/zh-CN/Settings.json @@ -84,13 +84,13 @@ "DataBackup": "数据备份", "DataImport": "数据导入", "DataImportComplete": "数据导入完成", - "DataImportDescription": "将第三方服务数据导入 ONLYOFFICE 协作空间。数据导入支持传输数据，例如所有用户、其个人和共享文档。", + "DataImportDescription": "将第三方数据导入 ONLYOFFICE 协作空间。该功能可以转移数据，例如所有用户、他们的个人文件或与其共享的文件。", "DataImportProcessing": "数据导入处理", "Deactivate": "停用", "DeactivateOrDeletePortal": "停用或删除协作空间。", "DefaultSettings": "默认设置", - "DefineQuotaPerRoom": "定义每个房间的配额", - "DefineQuotaPerUser": "定义每位用户的配额", + "DefineQuotaPerRoom": "设置每个房间的额度", + "DefineQuotaPerUser": "设置每个用户的额度", "DeleteDocSpace": "删除协作空间", "DeleteDocSpaceInfo": "删除空间前，请确保已关闭自动计费。您可在 <1>Stripe 客户门户中查看自动计费状态。", "DeleteTheme": "删除主题", @@ -202,8 +202,8 @@ "ProjectsDescription": "每个项目会被导入为一个房间，包含项目中所有的文档和用户。项目经理会成为房间的所有者", "QuotaPerRoom": "每个房间的配额", "QuotaPerUser": "每位用户的配额", - "Quotas": "配额", - "QuotasDescription": "您可以在此处设置用户和房间的存储空间配额。<1>帮助中心。", + "Quotas": "分配额度", + "QuotasDescription": "您可以设置用户和房间的储存空间额度。 <1>帮助中心。", "Recalculate": "重新计算", "RecoveryFileNotSelected": "恢复错误。未选择恢复文件", "RestoreBackup": "数据恢复", @@ -232,8 +232,8 @@ "SessionLifetime": "会话寿命", "SessionLifetimeMobileDescription": "通过会话生存期，可设置协作空间用户需要再输入凭据才能访问空间的时间（单位为分钟）。", "SessionLifetimeSettingDescription": "调整会话生命周期，可定义自动注销的时间段。保存后，会对所有用户执行注销。", - "SetDefaultRoomQuota": "为协作空间中的房间设置默认存储空间配额。房间管理员后续可对每个房间单独调整。", - "SetDefaultUserQuota": "为协作空间中的用户设置存储空间配额。用户配额会影响每位用户“我的文档”文件夹的存储空间上限。", + "SetDefaultRoomQuota": "设置此协作空间中，房间的默认储存空间额度。房间管理员后续可对每个房间进行单独调整。", + "SetDefaultUserQuota": "设置此协作空间的用户的储存空间额度。此操作会影响每位用户“我的文档”板块的储存空间限制。", "SettingPasswordDescription": "配置密码强度设置，强制使用更安全的强密码。", "SettingPasswordStrengthMobileDescription": "通过“密码强度设置”，确定密码阻止猜测和暴力攻击的有效性。", "SettingPasswordTittle": "密码强度设置", diff --git a/packages/client/public/locales/zh-CN/Translations.json b/packages/client/public/locales/zh-CN/Translations.json index ec96c9d617..d075b33a4c 100644 --- a/packages/client/public/locales/zh-CN/Translations.json +++ b/packages/client/public/locales/zh-CN/Translations.json @@ -24,7 +24,7 @@ "LinkCopySuccess": "链接已复制到剪贴板中", "LinkHasExpiredAndHasBeenDisabled": "此链接过期，已被禁用", "LinkValidTime": "该链接仅在{{days_count}}天内有效。", - "NewForm": "PDF表格", + "NewForm": "PDF 表单", "Other": "其他", "OwnerChange": "变更所有者", "Presentations": "演示文稿", @@ -42,7 +42,7 @@ "RoleUserDescription": "用户仅可访问管理员已邀请其加入的房间。其不能创建房间、文件夹或文件。", "RoleViewer": "可查看", "RoleViewerDescription": "文件查看", - "SearchByHeadOfGroup": "按群组负责人进行搜索", + "SearchByHeadOfGroup": "按组长进行搜索", "SearchByOwner": "按所有者搜索", "Spreadsheets": "电子表格", "SubNewForm": "空白", diff --git a/packages/client/src/HOCs/withContent.js b/packages/client/src/HOCs/withContent.js index 0c018b4189..ba491dfc09 100644 --- a/packages/client/src/HOCs/withContent.js +++ b/packages/client/src/HOCs/withContent.js @@ -33,11 +33,15 @@ import { ShareAccessRights, } from "@docspace/shared/enums"; //import { combineUrl } from "@docspace/shared/utils/combineUrl"; -import { getCorrectDate, getCookie } from "@docspace/shared/utils"; +import { + getCorrectDate, + getCookie, + getTitleWithoutExtension, +} from "@docspace/shared/utils"; import { LANGUAGE } from "@docspace/shared/constants"; import config from "PACKAGE_FILE"; //import EditingWrapperComponent from "../components/EditingWrapperComponent"; -import { getTitleWithoutExtension } from "SRC_DIR/helpers/filesUtils"; + //import { getDefaultFileName } from "@docspace/client/src/helpers/filesUtils"; //import ItemIcon from "../components/ItemIcon"; diff --git a/packages/client/src/HOCs/withHotkeys.js b/packages/client/src/HOCs/withHotkeys.js index 60b487753c..9444fee28e 100644 --- a/packages/client/src/HOCs/withHotkeys.js +++ b/packages/client/src/HOCs/withHotkeys.js @@ -64,7 +64,7 @@ const withHotkeys = (Component) => { openItem, selectAll, activateHotkeys, - backToParentFolder, + onClickBack, uploadFile, enabledHotkeys, @@ -247,7 +247,7 @@ const withHotkeys = (Component) => { useHotkeys("Enter", () => openItem(t), hotkeysFilter); //Back to parent folder - useHotkeys("Backspace", backToParentFolder, hotkeysFilter); + useHotkeys("Backspace", onClickBack, hotkeysFilter); //Change viewAs useHotkeys( @@ -456,7 +456,7 @@ const withHotkeys = (Component) => { const { isAvailableOption, deleteAction, - backToParentFolder, + onClickBack, setFavoriteAction, deleteRooms, archiveRooms, @@ -506,7 +506,7 @@ const withHotkeys = (Component) => { openItem, selectAll, activateHotkeys, - backToParentFolder, + onClickBack, uploadFile, enabledHotkeys, diff --git a/packages/client/src/HOCs/withLoading.js b/packages/client/src/HOCs/withLoading.js index 8aa2b5acf5..c766430f7c 100644 --- a/packages/client/src/HOCs/withLoading.js +++ b/packages/client/src/HOCs/withLoading.js @@ -27,6 +27,7 @@ import React, { useEffect, useState } from "react"; import { observer, inject } from "mobx-react"; import { isMobile } from "@docspace/shared/utils"; +import { DeviceType } from "@docspace/shared/enums"; const withLoading = (WrappedComponent) => { const withLoading = (props) => { @@ -43,9 +44,10 @@ const withLoading = (WrappedComponent) => { isBurgerLoading, setIsBurgerLoading, enablePortalRename, + deviceType, } = props; - const [mobileView, setMobileView] = useState(true); + const viewMobile = deviceType === DeviceType.mobile; useEffect(() => { if (window.location.pathname.includes("profile")) { @@ -63,26 +65,10 @@ const withLoading = (WrappedComponent) => { } }, [isLoadedArticleBody, setIsBurgerLoading]); - useEffect(() => { - window.addEventListener("resize", checkInnerWidth); - - return () => window.removeEventListener("resize", checkInnerWidth); - }, []); - - const checkInnerWidth = () => { - if (isMobile()) { - setMobileView(true); - } else { - setMobileView(false); - } - }; - const pathname = location.pathname; const index = pathname.lastIndexOf("/"); const setting = pathname.slice(index + 1); - const viewMobile = !!(isMobile() && mobileView); - const loadedPortalRenaming = enablePortalRename ? isLoadedPortalRenaming : true; @@ -164,8 +150,12 @@ const withLoading = (WrappedComponent) => { isLoadedWelcomePageSettings, } = common; - const { isBurgerLoading, setIsBurgerLoading, enablePortalRename } = - settingsStore; + const { + isBurgerLoading, + setIsBurgerLoading, + enablePortalRename, + deviceType, + } = settingsStore; return { isLoadedArticleBody, @@ -180,6 +170,7 @@ const withLoading = (WrappedComponent) => { isBurgerLoading, setIsBurgerLoading, enablePortalRename, + deviceType, }; })(observer(withLoading)); }; diff --git a/packages/client/src/HOCs/withQuickButtons.js b/packages/client/src/HOCs/withQuickButtons.js index a5d2ea8d42..1fee72e82e 100644 --- a/packages/client/src/HOCs/withQuickButtons.js +++ b/packages/client/src/HOCs/withQuickButtons.js @@ -114,6 +114,7 @@ export default function withQuickButtons(WrappedComponent) { isPublicRoom, isPersonalRoom, isArchiveFolder, + currentDeviceType, } = this.props; const quickButtonsComponent = ( @@ -134,6 +135,7 @@ export default function withQuickButtons(WrappedComponent) { folderCategory={folderCategory} onCopyPrimaryLink={this.onCopyPrimaryLink} isArchiveFolder={isArchiveFolder} + currentDeviceType={currentDeviceType} /> ); @@ -177,6 +179,7 @@ export default function withQuickButtons(WrappedComponent) { return { theme: settingsStore.theme, + currentDeviceType: settingsStore.currentDeviceType, isAdmin: authStore.isAdmin, lockFileAction, setFavoriteAction, diff --git a/packages/client/src/components/Article/Body/Banner.js b/packages/client/src/components/Article/Body/Banner.js index ae66cded22..08852bb68b 100644 --- a/packages/client/src/components/Article/Body/Banner.js +++ b/packages/client/src/components/Article/Body/Banner.js @@ -39,7 +39,8 @@ const Banner = ({ setSubmitToGalleryDialogVisible, setClosedCampaigns, getBanner, - campaignImage, + campaignBackground, + campaignIcon, campaignTranslate, campaignConfig, currentCampaign, @@ -73,12 +74,13 @@ const Banner = ({ return (
{t("Settings:AdditionalResources")}
@@ -321,6 +332,7 @@ export default inject(({ settingsStore, common, currentQuotaStore }) => {
additionalResourcesData,
additionalResourcesIsDefault,
+ deviceType,
} = settingsStore;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
@@ -333,6 +345,7 @@ export default inject(({ settingsStore, common, currentQuotaStore }) => {
setIsLoadedAdditionalResources,
isLoadedAdditionalResources,
isSettingPaid: isBrandingAndCustomizationAvailable,
+ deviceType,
};
})(
withLoading(
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js b/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
index 3c57a10d82..373cc203ea 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
@@ -39,6 +39,7 @@ import { SaveCancelButtons } from "@docspace/shared/components/save-cancel-butto
import { Link } from "@docspace/shared/components/link";
import { mobile, size } from "@docspace/shared/utils";
import { isManagement } from "@docspace/shared/utils/common";
+import { DeviceType } from "@docspace/shared/enums";
import withLoading from "SRC_DIR/HOCs/withLoading";
import LoaderCompanyInfoSettings from "../sub-components/loaderCompanyInfoSettings";
@@ -91,9 +92,11 @@ const CompanyInfoSettings = (props) => {
isLoadedCompanyInfoSettingsData,
buildVersionInfo,
personal,
+ deviceType,
} = props;
const navigate = useNavigate();
const location = useLocation();
+ const isMobileView = deviceType === DeviceType.mobile;
const defaultCompanySettingsError = {
hasErrorAddress: false,
@@ -126,13 +129,14 @@ const CompanyInfoSettings = (props) => {
checkWidth();
window.addEventListener("resize", checkWidth);
return () => window.removeEventListener("resize", checkWidth);
- }, []);
+ }, [isMobileView]);
const checkWidth = () => {
const url = isManagement()
? "/branding"
: "portal-settings/customization/branding";
window.innerWidth > size.mobile &&
+ !isMobileView &&
location.pathname.includes("company-info-settings") &&
navigate(url);
};
@@ -507,6 +511,7 @@ export default inject(({ settingsStore, common, currentQuotaStore }) => {
companyInfoSettingsData,
buildVersionInfo,
personal,
+ deviceType,
} = settingsStore;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
@@ -522,6 +527,7 @@ export default inject(({ settingsStore, common, currentQuotaStore }) => {
buildVersionInfo,
personal,
isSettingPaid: isBrandingAndCustomizationAvailable,
+ deviceType,
};
})(
withLoading(
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js b/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
index bfbac80e66..468e0683d0 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
@@ -23,7 +23,6 @@
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
-
import { useState, useEffect } from "react";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
@@ -69,9 +68,10 @@ const WhiteLabel = (props) => {
setLogoUrlsWhiteLabel,
defaultLogoTextWhiteLabel,
enableRestoreButton,
+ deviceType,
- currentDeviceType,
resetIsInit,
+ standalone,
} = props;
const navigate = useNavigate();
const location = useLocation();
@@ -80,10 +80,12 @@ const WhiteLabel = (props) => {
const [logoTextWhiteLabel, setLogoTextWhiteLabel] = useState("");
const [isSaving, setIsSaving] = useState(false);
- const isMobileView = currentDeviceType === DeviceType.mobile;
+ const isMobileView = deviceType === DeviceType.mobile;
const init = async () => {
- const isWhiteLabelPage = location.pathname.includes("white-label");
+ const isWhiteLabelPage = standalone
+ ? location.pathname.includes("white-label")
+ : true;
if ((isMobileView && isWhiteLabelPage) || !isMobileView) {
const page = isMobileView ? "white-label" : "branding";
@@ -94,19 +96,25 @@ const WhiteLabel = (props) => {
useEffect(() => {
init();
checkWidth();
- window.addEventListener("resize", checkWidth);
return () => {
- window.removeEventListener("resize", checkWidth);
resetIsInit();
};
}, []);
+ useEffect(() => {
+ window.addEventListener("resize", checkWidth);
+ return () => {
+ window.removeEventListener("resize", checkWidth);
+ };
+ }, [isMobileView]);
+
const checkWidth = () => {
const url = isManagement()
? "/branding"
: "/portal-settings/customization/branding";
window.innerWidth > size.mobile &&
+ !isMobileView &&
location.pathname.includes("white-label") &&
navigate(url);
};
@@ -550,8 +558,11 @@ export default inject(({ settingsStore, common, currentQuotaStore }) => {
resetIsInit,
} = common;
- const { whiteLabelLogoUrls: defaultWhiteLabelLogoUrls, currentDeviceType } =
- settingsStore;
+ const {
+ whiteLabelLogoUrls: defaultWhiteLabelLogoUrls,
+ deviceType,
+ standalone,
+ } = settingsStore;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
return {
@@ -569,7 +580,8 @@ export default inject(({ settingsStore, common, currentQuotaStore }) => {
defaultLogoTextWhiteLabel,
enableRestoreButton,
- currentDeviceType,
+ deviceType,
resetIsInit,
+ standalone,
};
})(withTranslation(["Settings", "Profile", "Common"])(observer(WhiteLabel)));
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
index 6a24b8f403..fdec1ceae7 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
@@ -142,7 +142,7 @@ const StyledSettingsComponent = styled.div`
}
@media ${mobile} {
- padding-right: 8px;
+ padding-inline-end: 8px;
}
}
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
index c1e17d6086..e3d09aa775 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
@@ -34,7 +34,7 @@ import { Button } from "@docspace/shared/components/button";
import { inject, observer } from "mobx-react";
import { useNavigate } from "react-router-dom";
-import { isMobile } from "@docspace/shared/utils";
+import { isMobileDevice } from "@docspace/shared/utils";
import checkScrollSettingsBlock from "../utils";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
@@ -167,7 +167,7 @@ const DNSSettings = (props) => {
setDNSName(value);
};
const checkInnerWidth = useCallback(() => {
- if (!isMobile()) {
+ if (!isMobileDevice()) {
setIsCustomizationView(true);
const currentUrl = window.location.href.replace(
@@ -183,7 +183,7 @@ const DNSSettings = (props) => {
} else {
setIsCustomizationView(false);
}
- }, [isMobile, setIsCustomizationView]);
+ }, [isMobileDevice, setIsCustomizationView]);
const domainExampleText = " ourcompany.com";
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
index 91bd861142..686713dd01 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
@@ -38,7 +38,7 @@ import { COOKIE_EXPIRATION_YEAR } from "@docspace/shared/constants";
import { LANGUAGE } from "@docspace/shared/constants";
import { setCookie } from "@docspace/shared/utils/cookie";
import { useNavigate } from "react-router-dom";
-import { isMobile } from "@docspace/shared/utils";
+import { isMobileDevice } from "@docspace/shared/utils";
import checkScrollSettingsBlock from "../utils";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import LoaderCustomization from "../sub-components/loaderCustomization";
@@ -97,10 +97,10 @@ const LanguageAndTimeZone = (props) => {
initSettings,
isLoadedPage,
currentColorScheme,
- currentDeviceType,
+ deviceType,
} = props;
- const isMobileView = currentDeviceType === DeviceType.mobile;
+ const isMobileView = deviceType === DeviceType.mobile;
const navigate = useNavigate();
@@ -418,7 +418,7 @@ const LanguageAndTimeZone = (props) => {
};
const checkInnerWidth = () => {
- if (!isMobile()) {
+ if (!isMobileDevice()) {
setState((val) => ({ ...val, isCustomizationView: true }));
const currentUrl = window.location.href.replace(
@@ -565,7 +565,7 @@ export default inject(({ settingsStore, setup, common, userStore }) => {
cultures,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
- currentDeviceType,
+ deviceType,
} = settingsStore;
const { user } = userStore;
@@ -589,7 +589,7 @@ export default inject(({ settingsStore, setup, common, userStore }) => {
setIsLoaded,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
- currentDeviceType,
+ deviceType,
};
})(
withCultureNames(
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
index 8834e70e6a..feb553c836 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
@@ -32,7 +32,7 @@ import { TextInput } from "@docspace/shared/components/text-input";
import { SaveCancelButtons } from "@docspace/shared/components/save-cancel-buttons";
import { inject, observer } from "mobx-react";
import { useNavigate } from "react-router-dom";
-import { isMobile } from "@docspace/shared/utils";
+import { isMobileDevice } from "@docspace/shared/utils";
import checkScrollSettingsBlock from "../utils";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
@@ -264,7 +264,7 @@ const PortalRenaming = (props) => {
};
const checkInnerWidth = useCallback(() => {
- if (!isMobile()) {
+ if (!isMobileDevice()) {
setIsCustomizationView(true);
const currentUrl = window.location.href.replace(
@@ -279,7 +279,7 @@ const PortalRenaming = (props) => {
} else {
setIsCustomizationView(false);
}
- }, [isMobile, setIsCustomizationView]);
+ }, [isMobileDevice, setIsCustomizationView]);
const onOpenModal = () => {
setIsShowModal(true);
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
index 0b88ca143d..74a199720d 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
@@ -35,7 +35,7 @@ import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
import { inject, observer } from "mobx-react";
import { useNavigate } from "react-router-dom";
-import { isMobile } from "@docspace/shared/utils";
+import { isMobileDevice } from "@docspace/shared/utils";
import checkScrollSettingsBlock from "../utils";
import { StyledSettingsComponent } from "./StyledSettings";
import LoaderCustomization from "../sub-components/loaderCustomization";
@@ -283,7 +283,7 @@ const WelcomePageSettings = (props) => {
};
const checkInnerWidth = () => {
- if (!isMobile()) {
+ if (!isMobileDevice()) {
setState((val) => ({ ...val, isCustomizationView: true }));
const currentUrl = window.location.href.replace(
diff --git a/packages/client/src/pages/PortalSettings/categories/common/branding.js b/packages/client/src/pages/PortalSettings/categories/common/branding.js
index cd8d65a46c..1b044e8a60 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/branding.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/branding.js
@@ -86,10 +86,10 @@ const Branding = ({
isLoadedCompanyInfoSettingsData,
isSettingPaid,
standalone,
- currentDeviceType,
+ deviceType,
portals,
}) => {
- const isMobileView = currentDeviceType === DeviceType.mobile;
+ const isMobileView = deviceType === DeviceType.mobile;
useEffect(() => {
setDocumentTitle(t("Branding"));
@@ -103,16 +103,23 @@ const Branding = ({
};
}, []);
- if (isMobileView && standalone)
+ const hideBlock = isManagement() ? false : portals?.length > 1 ? true : false;
+
+ const showSettings = standalone && !hideBlock;
+
+ if (isMobileView)
return (
-
{isLoadedCompanyInfoSettingsData ? ( @@ -133,13 +140,13 @@ const Branding = ({ export default inject(({ settingsStore, currentQuotaStore, common }) => { const { isBrandingAndCustomizationAvailable } = currentQuotaStore; const { isLoadedCompanyInfoSettingsData } = common; - const { standalone, currentDeviceType, portals } = settingsStore; + const { standalone, portals, deviceType } = settingsStore; return { isLoadedCompanyInfoSettingsData, isSettingPaid: isBrandingAndCustomizationAvailable, standalone, - currentDeviceType, portals, + deviceType, }; })(withLoading(withTranslation(["Settings", "Common"])(observer(Branding)))); diff --git a/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js b/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js index 6bfe54a306..73d893be59 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js +++ b/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js @@ -46,14 +46,13 @@ StyledComponent.defaultProps = { theme: Base }; const CustomizationNavbar = ({ t, - isLoaded, tReady, setIsLoadedCustomizationNavbar, isLoadedPage, isSettingPaid, enablePortalRename, }) => { - const isLoadedSetting = isLoaded && tReady; + const isLoadedSetting = tReady; const navigate = useNavigate(); useEffect(() => { @@ -103,9 +102,8 @@ const CustomizationNavbar = ({ export default inject(({ common, settingsStore }) => { const { enablePortalRename } = settingsStore; - const { isLoaded, setIsLoadedCustomizationNavbar } = common; + const { setIsLoadedCustomizationNavbar } = common; return { - isLoaded, setIsLoadedCustomizationNavbar, enablePortalRename, }; diff --git a/packages/client/src/pages/PortalSettings/categories/common/index.js b/packages/client/src/pages/PortalSettings/categories/common/index.js index d885fad5ee..e98c3ea4d1 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/index.js +++ b/packages/client/src/pages/PortalSettings/categories/common/index.js @@ -139,7 +139,7 @@ export default inject(({ settingsStore, common }) => { const currentDeviceType = settingsStore.currentDeviceType; - const isMobileView = currentDeviceType === DeviceType.mobile; + const isMobileView = settingsStore.deviceType === DeviceType.mobile; return { loadBaseInfo: async (page) => { await initSettings(page); diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js index 1bf28acd24..41418914b1 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js @@ -59,7 +59,7 @@ export const ButtonWrapper = styled.div` align-items: center; .request-again-link { - margin-left: 4px; + margin-inline-start: 4px; } @media ${mobile} { diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js index c3ba074fa2..5d9736fac7 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js @@ -55,6 +55,8 @@ import { TooltipContent } from "../sub-components/TooltipContent"; import SubtitleUrl from "PUBLIC_DIR/images/sdk-presets_subtitle.react.svg?url"; import SearchUrl from "PUBLIC_DIR/images/sdk-presets_files-search.react.svg?url"; +import SubtitleUrlDark from "PUBLIC_DIR/images/sdk-presets_subtitle_dark.png?url"; +import SearchUrlDark from "PUBLIC_DIR/images/sdk-presets_files-search_dark.png?url"; import { toastr } from "@docspace/shared/components/toast"; @@ -585,7 +587,7 @@ const FileSelector = (props) => { {
scale={true}
onChange={onChangeCount}
placeholder={t("EnterCount")}
- value={config.count}
+ value={config.filter.count}
tabIndex={6}
/>
@@ -1324,8 +1327,8 @@ const Manager = (props) => {
scale={true}
onChange={onChangePage}
placeholder={t("EnterPage")}
- value={config.page}
- isDisabled={!config.count}
+ value={config.filter.page}
+ isDisabled={!config.filter.count}
tabIndex={7}
/>
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js
index f93bdc1276..4b6fffe202 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js
@@ -66,7 +66,8 @@ const TileContainer = styled.div`
}
.icon {
- transform: scale(-1, 1);
+ ${({ theme }) =>
+ theme.interfaceDirection === "ltr" && "transform: scale(-1, 1);"}
}
:hover {
@@ -89,7 +90,7 @@ const PresetTile = (props) => {
{title}
- 
+
{description}
{isLoadedCompanyInfoSettingsData ? ( @@ -133,13 +140,13 @@ const Branding = ({ export default inject(({ settingsStore, currentQuotaStore, common }) => { const { isBrandingAndCustomizationAvailable } = currentQuotaStore; const { isLoadedCompanyInfoSettingsData } = common; - const { standalone, currentDeviceType, portals } = settingsStore; + const { standalone, portals, deviceType } = settingsStore; return { isLoadedCompanyInfoSettingsData, isSettingPaid: isBrandingAndCustomizationAvailable, standalone, - currentDeviceType, portals, + deviceType, }; })(withLoading(withTranslation(["Settings", "Common"])(observer(Branding)))); diff --git a/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js b/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js index 6bfe54a306..73d893be59 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js +++ b/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js @@ -46,14 +46,13 @@ StyledComponent.defaultProps = { theme: Base }; const CustomizationNavbar = ({ t, - isLoaded, tReady, setIsLoadedCustomizationNavbar, isLoadedPage, isSettingPaid, enablePortalRename, }) => { - const isLoadedSetting = isLoaded && tReady; + const isLoadedSetting = tReady; const navigate = useNavigate(); useEffect(() => { @@ -103,9 +102,8 @@ const CustomizationNavbar = ({ export default inject(({ common, settingsStore }) => { const { enablePortalRename } = settingsStore; - const { isLoaded, setIsLoadedCustomizationNavbar } = common; + const { setIsLoadedCustomizationNavbar } = common; return { - isLoaded, setIsLoadedCustomizationNavbar, enablePortalRename, }; diff --git a/packages/client/src/pages/PortalSettings/categories/common/index.js b/packages/client/src/pages/PortalSettings/categories/common/index.js index d885fad5ee..e98c3ea4d1 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/index.js +++ b/packages/client/src/pages/PortalSettings/categories/common/index.js @@ -139,7 +139,7 @@ export default inject(({ settingsStore, common }) => { const currentDeviceType = settingsStore.currentDeviceType; - const isMobileView = currentDeviceType === DeviceType.mobile; + const isMobileView = settingsStore.deviceType === DeviceType.mobile; return { loadBaseInfo: async (page) => { await initSettings(page); diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js index 1bf28acd24..41418914b1 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js @@ -59,7 +59,7 @@ export const ButtonWrapper = styled.div` align-items: center; .request-again-link { - margin-left: 4px; + margin-inline-start: 4px; } @media ${mobile} { diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js index c3ba074fa2..5d9736fac7 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js @@ -55,6 +55,8 @@ import { TooltipContent } from "../sub-components/TooltipContent"; import SubtitleUrl from "PUBLIC_DIR/images/sdk-presets_subtitle.react.svg?url"; import SearchUrl from "PUBLIC_DIR/images/sdk-presets_files-search.react.svg?url"; +import SubtitleUrlDark from "PUBLIC_DIR/images/sdk-presets_subtitle_dark.png?url"; +import SearchUrlDark from "PUBLIC_DIR/images/sdk-presets_files-search_dark.png?url"; import { toastr } from "@docspace/shared/components/toast"; @@ -585,7 +587,7 @@ const FileSelector = (props) => {