From 250d58f8a14ce2a359749fca34ef7944f9f65104 Mon Sep 17 00:00:00 2001 From: Maximilian Hippler Date: Tue, 13 Feb 2024 16:09:06 +0100 Subject: [PATCH 1/3] Fixed wrong keycloak docs --- docs/features/authentication.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/features/authentication.md b/docs/features/authentication.md index 1b6f497d4..84df9fca7 100644 --- a/docs/features/authentication.md +++ b/docs/features/authentication.md @@ -65,8 +65,9 @@ At Keycloak, create a new client and assign a `Client-ID`, this client comes wit To enable Keycloak as a sign in option, set those variables to define the social provider and specify its configuration: ```ini -SOCIAL_PROVIDERS=allauth.socialaccount.providers.keycloak -SOCIALACCOUNT_PROVIDERS='{ "keycloak": { "KEYCLOAK_URL": "https://auth.example.com/", "KEYCLOAK_REALM": "master" } }' +SOCIAL_PROVIDERS=allauth.socialaccount.providers.openid_connect +SOCIALACCOUNT_PROVIDERS='{"openid_connect":{"APPS":[{"provider_id":"keycloak","name":"Keycloak","client_id":"KEYCLOAK_CLIENT_ID","secret":"KEYCLOAK_CLIENT_SECRET","settings":{"server_url":"https://auth.example.org/realms/KEYCLOAK_REALM/.well-known/openid-configuration"}}]}} +' ``` 1. Restart the service, login as superuser and open the `Admin` page. From 80c594d486d3dd2784bdf26e5e8e57bd0c4a70e5 Mon Sep 17 00:00:00 2001 From: dalan Date: Wed, 14 Feb 2024 02:29:10 +0000 Subject: [PATCH 2/3] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (490 of 490 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/ --- cookbook/locale/zh_CN/LC_MESSAGES/django.po | 24 +++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/cookbook/locale/zh_CN/LC_MESSAGES/django.po b/cookbook/locale/zh_CN/LC_MESSAGES/django.po index 3025787ad..084689d3f 100644 --- a/cookbook/locale/zh_CN/LC_MESSAGES/django.po +++ b/cookbook/locale/zh_CN/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-05-18 14:28+0200\n" -"PO-Revision-Date: 2023-02-26 13:15+0000\n" -"Last-Translator: 吕楪 \n" +"PO-Revision-Date: 2024-02-15 03:19+0000\n" +"Last-Translator: dalan \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" @@ -480,34 +480,32 @@ msgid "One of queryset or hash_key must be provided" msgstr "必须提供 queryset 或 hash_key 之一" #: .\cookbook\helper\recipe_url_import.py:266 -#, fuzzy -#| msgid "Use fractions" msgid "reverse rotation" -msgstr "使用分数" +msgstr "反向旋转" #: .\cookbook\helper\recipe_url_import.py:267 msgid "careful rotation" -msgstr "" +msgstr "小心旋转" #: .\cookbook\helper\recipe_url_import.py:268 msgid "knead" -msgstr "" +msgstr "揉" #: .\cookbook\helper\recipe_url_import.py:269 msgid "thicken" -msgstr "" +msgstr "增稠" #: .\cookbook\helper\recipe_url_import.py:270 msgid "warm up" -msgstr "" +msgstr "预热" #: .\cookbook\helper\recipe_url_import.py:271 msgid "ferment" -msgstr "" +msgstr "发酵" #: .\cookbook\helper\recipe_url_import.py:272 msgid "sous-vide" -msgstr "" +msgstr "真空烹调法" #: .\cookbook\helper\shopping_helper.py:157 msgid "You must supply a servings size" @@ -549,10 +547,8 @@ msgid "Imported %s recipes." msgstr "导入了%s菜谱。" #: .\cookbook\integration\openeats.py:26 -#, fuzzy -#| msgid "Recipe Home" msgid "Recipe source:" -msgstr "菜谱主页" +msgstr "菜谱来源：" #: .\cookbook\integration\paprika.py:49 msgid "Notes" From 038d03783f0d9df0215435f15eb964efa049493a Mon Sep 17 00:00:00 2001 From: dalan Date: Wed, 14 Feb 2024 03:02:42 +0000 Subject: [PATCH 3/3] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.2% (558 of 562 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/ --- vue/src/locales/zh_Hans.json | 80 +++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/vue/src/locales/zh_Hans.json b/vue/src/locales/zh_Hans.json index e28d0a0c7..43692c885 100644 --- a/vue/src/locales/zh_Hans.json +++ b/vue/src/locales/zh_Hans.json @@ -480,5 +480,83 @@ "Create Recipe": "创建食谱", "Import Recipe": "导入食谱", "recipe_property_info": "您也可以为食物添加属性，以便根据食谱自动计算！", - "per_serving": "每份" + "per_serving": "每份", + "converted_amount": "换算量", + "Open_Data_Import": "开放数据导入", + "StartDate": "开始日期", + "EndDate": "结束日期", + "OrderInformation": "对象按照从小到大的顺序排列。", + "total": "全部", + "pound": "磅（重量）", + "imperial_quart": "英制夸脱【imp qt】（英制，体积）", + "imperial_pint": "英制品脱【imp pt】（英制，体积）", + "imperial_tbsp": "英制汤匙【imp tbsp】（英制，体积）", + "make_now_count": "至多缺少的成分", + "l": "升【l】（公制，体积）", + "Welcome": "欢迎", + "Input": "输入", + "Undo": "撤销", + "Number of Objects": "对象数量", + "Alignment": "校准", + "Delete_All": "全部删除", + "Conversion": "转换", + "Properties": "属性", + "ShowRecentlyCompleted": "显示最近完成的项目", + "ShoppingBackgroundSyncWarning": "网络状况不佳，正在等待进行同步……", + "show_step_ingredients_setting": "在食谱步骤旁边显示成分", + "show_step_ingredients_setting_help": "在食谱步骤旁边添加成分表。在创建时应用。可以在编辑配方视图中覆盖。", + "show_step_ingredients": "显示该步骤的成分", + "hide_step_ingredients": "隐藏该步骤的成分", + "Logo": "徽标", + "Show_Logo": "显示徽标", + "Show_Logo_Help": "在导航栏中显示 Tandoor 或空间徽标。", + "Nav_Text_Mode": "文本导航模式", + "Nav_Text_Mode_Help": "每个主题的行为都不同。", + "Space_Cosmetic_Settings": "空间管理员可以更改某些装饰设置，并将覆盖该空间的客户端设置。", + "show_ingredients_table": "在步骤文本旁边显示成分表", + "Enable": "启用", + "g": "克【g】（公制，重量）", + "gallon": "加仑【gal】美制，体积）", + "tbsp": "汤匙【tbsp】（美制，体积）", + "tsp": "茶匙【tsp】（美制，体积）", + "imperial_gallon": "英制加仑【imp gal】（英制，体积）", + "imperial_tsp": "英制茶匙【imp tsp】（英制，体积）", + "Choose_Category": "选择类别", + "Back": "后退", + "Food_Replace": "食物替换", + "Unit_Replace": "单位替换", + "Datatype": "数据类型", + "NoMoreUndo": "没有可撤消的更改。", + "FDC_Search": "FDC搜索", + "FDC_ID_help": "FDC数据库ID", + "property_type_fdc_hint": "只有具有 FDC ID 的属性类型才能自动从 FDC 数据库中提取数据", + "Data_Import_Info": "通过导入社区精选的食物、单位等列表来增强您的空间，以提升您的食谱收藏。", + "Update_Existing_Data": "更新现有数据", + "Use_Metric": "使用公制单位", + "Learn_More": "了解更多", + "converted_unit": "换算单位", + "base_unit": "基本单位", + "base_amount": "基本量", + "Property": "属性", + "Property_Editor": "属性编辑器", + "imperial_fluid_ounce": "英制液体盎司【imp fl oz】（英制，体积）", + "kg": "千克【kg】（公制，重量）", + "ounce": "盎司【oz】（重量）", + "ml": "毫升【ml】（公制，体积）", + "fluid_ounce": "液体盎司【fl oz】（美制，体积）", + "pint": "品脱 【pt】（美制，体积）", + "quart": "夸脱【qt】（美制，体积）", + "Name_Replace": "名称替换", + "FDC_ID": "FDC ID", + "err_importing_recipe": "导入菜谱时出错！", + "open_data_help_text": "Tandoor开放数据项目为Tandoor提供社区贡献的数据。该字段在导入时会自动填充，并可以之后更新。", + "Open_Data_Slug": "开放数据标识", + "Properties_Food_Amount": "食物数量属性", + "Properties_Food_Unit": "食品单位属性", + "CustomTheme": "自定义主题", + "CustomThemeHelp": "通过上传自定义 CSS 文件覆盖所选主题的样式。", + "CustomImageHelp": "上传图片以在空间概览中显示。", + "CustomNavLogoHelp": "上传图像以用作导航栏徽标。", + "CustomLogoHelp": "上传不同尺寸的方形图像以更改为浏览器选项卡和安装的网络应用程序中的徽标。", + "CustomLogos": "自定义徽标" }