From fc3a0bd4279e9ee3fd2bc4c41a6ae737bd910192 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 13 Jan 2021 09:08:53 +0000 Subject: [PATCH 1/2] Latest translations and fallbacks --- public/language/he/admin/extend/rewards.json | 4 ++-- public/language/he/admin/menu.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/language/he/admin/extend/rewards.json b/public/language/he/admin/extend/rewards.json index aebf2d1986..efffa7057f 100644 --- a/public/language/he/admin/extend/rewards.json +++ b/public/language/he/admin/extend/rewards.json @@ -1,10 +1,10 @@ { "rewards": "תגמולים", "condition-if-users": "אם משתמש", - "condition-is": "Is:", + "condition-is": "לערך:", "condition-then": "תגמל ב:", "max-claims": "מספר פעמים בה ניתן לדרוש תגמול", - "zero-infinite": "הזן 0 לאינסוף", + "zero-infinite": "הזן 0 ללא הגבלה", "delete": "מחק", "enable": "הפעל", "disable": "השבת", diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index ed2932db94..55365b28a9 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -19,7 +19,7 @@ "settings/general": "כללי", "settings/homepage": "דף הבית", "settings/navigation": "ניווט", - "settings/reputation": "מוניטין ודיווחים", + "settings/reputation": "דיווחים ומוניטין", "settings/email": "דוא\"ל", "settings/user": "משתמשים", "settings/group": "קבוצות", @@ -27,7 +27,7 @@ "settings/uploads": "העלאות", "settings/languages": "שפות", "settings/post": "פוסטים", - "settings/chat": "צ'אטים", + "settings/chat": "צ'אט", "settings/pagination": "עמודים", "settings/tags": "תגיות", "settings/notifications": "התראות", From fdf034724000a88147aa861294741d5ef37b2c0c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 13 Jan 2021 10:26:36 -0500 Subject: [PATCH 2/2] style: update codeclimate config to be less sensitive to duplicate code blocks After conversing with Dave from CodeClimate, he suggested these changes to adjust CodeClimate's detection so that it does not alert as frequently for code blocks that are similar, but functionally different. I also added a line to enforce the rule of threes, since CC often alerted only when two blocks were identical. --- .codeclimate.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index 33d591df48..63c7d5cab1 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -17,6 +17,14 @@ checks: similar-code: config: threshold: 65 +plugins: + duplication: + enabled: true + config: + languages: + javascript: + mass_threshold: 110 + count_threshold: 3 exclude_paths: - "public/vendor/*" - "test/*" \ No newline at end of file