Skip to content

Commit

Permalink
Fix app not loading correctly and most CI failures
Browse files Browse the repository at this point in the history
-Most frontend.modules.shortcut.core requires shouldn't have been
changed
- Revert back pt-BR and ru langs which had changes caught by bb lang:list
- Fix typos CI failing by updating config
  • Loading branch information
logseq-cldwalker committed May 18, 2023
1 parent 69bbf04 commit 0434a2b
Show file tree
Hide file tree
Showing 23 changed files with 261 additions and 408 deletions.
2 changes: 1 addition & 1 deletion src/main/frontend/components/command_palette.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns frontend.components.command-palette
(:require [frontend.handler.command-palette :as cp]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.modules.shortcut.data-helper :as shortcut-helper]
[frontend.context.i18n :refer [t]]
[frontend.search :as search]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/content.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
[frontend.state :as state]
[frontend.ui :as ui]
[frontend.util :as util]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[logseq.graph-parser.util :as gp-util]
[logseq.graph-parser.util.block-ref :as block-ref]
[frontend.util.url :as url-util]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/editor.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[frontend.handler.page :as page-handler]
[frontend.handler.paste :as paste-handler]
[frontend.mixins :as mixins]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.state :as state]
[frontend.ui :as ui]
[frontend.util :as util]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/onboarding/setups.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[frontend.mobile.graph-picker :as graph-picker]
[frontend.handler.notification :as notification]
[frontend.handler.external :as external-handler]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.handler.user :as user-handler]
[clojure.string :as string]
[goog.object :as gobj]))
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/search.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
[frontend.context.i18n :refer [t]]
[frontend.date :as date]
[reitit.frontend.easy :as rfe]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.util.text :as text-util]))

(defn highlight-exact-query
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/select.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
select-config to add a new use or select-type for this component. To use the
new select-type, set :ui/open-select to the select-type. See
:graph/open command for an example."
(:require [frontend.modules.shortcut.dicts :as shortcut]
(:require [frontend.modules.shortcut.core :as shortcut]
[frontend.context.i18n :refer [t]]
[frontend.search :as search]
[frontend.state :as state]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/shortcut.cljs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns frontend.components.shortcut
(:require [clojure.string :as str]
[frontend.context.i18n :refer [t]]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.modules.shortcut.data-helper :as dh]
[frontend.state :as state]
[frontend.ui :as ui]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/user/login.cljs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns frontend.components.user.login
(:require [rum.core :as rum]
[frontend.rum :refer [adapt-class]]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.handler.user :as user]
[cljs-bean.core :as bean]
[frontend.handler.notification :as notification]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/whiteboard.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[frontend.handler.common :as common-handler]
[frontend.handler.route :as route-handler]
[frontend.handler.whiteboard :as whiteboard-handler]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.rum :refer [use-bounding-client-rect use-breakpoint
use-click-outside]]
[frontend.state :as state]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/components/widgets.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
(:require [frontend.context.i18n :refer [t]]
[frontend.handler.page :as page-handler]
[frontend.handler.web.nfs :as nfs]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.ui :as ui]
[rum.core :as rum]
[frontend.config :as config]
Expand Down
491 changes: 239 additions & 252 deletions src/main/frontend/dicts/pt_br.cljc

Large diffs are not rendered by default.

134 changes: 1 addition & 133 deletions src/main/frontend/dicts/ru.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@

:notification/clear-all "Очистить всё"})

(def shortcut
(def shortcuts
{:shortcut.category/basics "Базовые"
:shortcut.category/formatting "Форматирование"
:shortcut.category/navigating "Навигация"
Expand Down Expand Up @@ -485,135 +485,3 @@
:command.dev/show-block-ast "(Dev) Показать AST блока"
:command.dev/show-page-data "(Dev) Показать данные страницы"
:command.dev/show-page-ast "(Dev) Показать AST страницы"})

(def shortcuts
{:shortcut.category/formatting "Formátovanie"
:shortcut.category/basics "Základy"
:shortcut.category/navigating "Navigácia"
:shortcut.category/block-editing "Úprava bloku (všeobecné)"
:shortcut.category/block-command-editing "Príkazy na úpravu bloku"
:shortcut.category/block-selection "Výber bloku (výber ukončíte stlačením klávesy Esc)"
:shortcut.category/toggle "Prepínače"
:shortcut.category/others "Ostatné"

:command.date-picker/complete "Výber dátumu: podvrďte vybraný deň"
:command.date-picker/next-day "Výber dátumu: vyberte nasledujúci deň"
:command.date-picker/next-week "Výber dátumu: vyberte nasledujúci týždeň"
:command.date-picker/prev-day "Výber dátumu: vyberte predchádzajúci deň"
:command.date-picker/prev-week "Výber dátumu: vyberte predchádzajúci týždeň"
:command.pdf/previous-page "PDF: Predchádzajúca strana aktuálneho PDF dokumentu"
:command.pdf/next-page "PDF: Nasledujúca strana aktuálneho PDF dokumentu"
:command.pdf/close "PDF: Zatvoriť aktuálny PDF dokument"
:command.pdf/find "PDF: Vyhľadať text v aktuálnom pdf dokumente"
:command.auto-complete/complete "Automatické dokončovanie: Potvrdiť vybranú položku"
:command.auto-complete/prev "Automatické dokončovanie: Vybrať predchádzajúcu položku"
:command.auto-complete/next "Automatické dokončovanie: Vybrať ďalšiu položku"
:command.auto-complete/shift-complete "Automatické dokončovanie: Otvoriť vybranú položku na bočnom paneli"
:command.auto-complete/open-link "Automatické dokončovanie: Otvoriť vybranú položku v prehliadači"
:command.cards/toggle-answers "Karty: Zobraziť/Skryť odpovede"
:command.cards/next-card "Karty: Ďalšia karta"
:command.cards/forgotten "Karty: Zabudnuté"
:command.cards/remembered "Karty: Zapamätané"
:command.cards/recall "Karty: take a while to recall"
:command.editor/escape-editing "Zrušiť editovanie"
:command.editor/backspace "Zmazať dozadu"
:command.editor/delete "Zmazať dopredu"
:command.editor/new-block "Vytvoriť nový blok"
:command.editor/new-line "Nový riadok v aktuálnom bloku"
:command.editor/new-whiteboard "Nová tabuľa"
:command.editor/follow-link "Prejsť na odkaz pod kurzorom"
:command.editor/open-link-in-sidebar "Otvoriť odkaz v bočnom paneli"
:command.editor/bold "Tučné"
:command.editor/italics "Kurzíva"
:command.editor/highlight "Zvýrazniť"
:command.editor/strike-through "Prečiarknuté"
:command.editor/clear-block "Odstrániť celý obsah bloku"
:command.editor/kill-line-before "Odstrániť riadok pred pozíciou kurzora"
:command.editor/copy-embed "Kopírovať vložený blok ukazujúci na aktuálny blok"
:command.editor/kill-line-after "Odstrániť riadok za pozíciou kurzora"
:command.editor/beginning-of-block "Presunúť kurzor na začiatok bloku"
:command.editor/end-of-block "Presunúť kurzor na koniec bloku"
:command.editor/forward-word "Posunúť kurzor o slovo dopredu"
:command.editor/backward-word "Presunúť kurzor o slovo dozadu"
:command.editor/forward-kill-word "Vymazať slovo dopredu"
:command.editor/backward-kill-word "Vymazať slovo dozadu"
:command.editor/replace-block-reference-at-point "Nahradiť referenciu bloku jeho obsahom v bode"
:command.editor/paste-text-in-one-block-at-point "Prilepiť text do jedného bloku v bode"
:command.editor/insert-youtube-timestamp "Vložiť YouTube časovú značku"
:command.editor/cycle-todo "Zmeniť stav TODO aktuálnej položky"
:command.editor/up "Posunúť kurzor nahor/Vybrať nahor"
:command.editor/down "Posunúť kurzor nadol/Vybrať nadol"
:command.editor/left "Posunúť kurzor doľava/Otvoriť vybraný blok na začiatku"
:command.editor/right "Posunúť kurzor doprava/Otvoriť vybraný blok na konci"
:command.editor/select-up "Vybrať obsah vyššie"
:command.editor/select-down "Vybrať obsah nižšie"
:command.editor/move-block-up "Posunúť blok nahor"
:command.editor/move-block-down "Posunúť blok nadol"
:command.editor/open-edit "Upraviť vybraný blok"
:command.editor/select-block-up "Vybrať blok vyššie"
:command.editor/select-block-down "Vybrať blok nižšie"
:command.editor/delete-selection "Odstrániť vybrané bloky"
:command.editor/expand-block-children "Rozbaliť"
:command.editor/collapse-block-children "Zbaliť"
:command.editor/indent "Odsadiť blok"
:command.editor/outdent "Zrusiť odsadenie bloku"
:command.editor/copy "Kopírovať (skopíruje buď výber alebo referenciu na blok)"
:command.editor/copy-text "Kopírovať výber ako text"
:command.editor/cut "Vystrihnúť"
:command.editor/undo "Zrusiť zmenu"
:command.editor/redo "Znova"
:command.editor/insert-link "HTML odkaz"
:command.editor/select-all-blocks "Vybrať všetky bloky"
:command.editor/select-parent "Vybrať rodičovský blok"
:command.editor/zoom-in "Priblížiť upravovaný blok/Inak vpred"
:command.editor/zoom-out "Oddialiť upravaný blok/Inak dozadu"
:command.ui/toggle-brackets "Prepnúť, či sa majú zobraziť hranaté zátvorky"
:command.go/search-in-page "Hľadať bloky na aktuálnej stránke"
:command.go/electron-find-in-page "Nájsť text na stránke"
:command.go/electron-jump-to-the-next "Preskočiť na ďalšiu zhodu s vyhľadávaním v Paneli hľadania"
:command.go/electron-jump-to-the-previous "Preskočiť na predchádzajúcu zhodu s vyhľadávaním v Paneli hľadania"
:command.go/search "Hľadať stránky a bloky"
:command.go/journals "Choď do denníkov"
:command.go/backward "Späť"
:command.go/forward "Vpred"
:command.search/re-index "Obnoviť index vyhľadávania"
:command.sidebar/open-today-page "Otvoriť dnešnú stránku v pravom bočnom paneli"
:command.sidebar/close-top "Zavri hornú položku na pravom bočnom paneli"
:command.sidebar/clear "Vymazať všetko na pravom bočnom paneli"
:command.misc/copy "Kopírovať"
:command.command-palette/toggle "Zobraziť/Skryť zoznam príkazov"
:command.graph/export-as-html "Exportovať verejné stránky grafu ako HTML"
:command.graph/open "Vybrať graf na otvorenie"
:command.graph/remove "Odstrániť graf"
:command.graph/add "Pridať graf"
:command.graph/save "Uložiť aktuálny graf na disk"
:command.graph/re-index "Preindexovať aktuálny graf"
:command.command/run "Spustiť príkaz GIT"
:command.go/home "Prejsť na hlavnú stránku"
:command.go/all-graphs "Prejsť na všetky grafy"
:command.go/whiteboards "Prejsť na tabule"
:command.go/all-pages "Prejsť na všetky stránky"
:command.go/graph-view "Prejsť na zobrazenie grafu"
:command.go/keyboard-shortcuts "Prejsť na klávesové skratky"
:command.go/tomorrow "Prejsť na zajtrajší denník"
:command.go/next-journal "Prejsť na ďalší denník"
:command.go/prev-journal "Prejsť na predchádzajúci denník"
:command.go/flashcards "Zobraziť/Skryť kartičky"
:command.ui/toggle-document-mode "Zobraziť/Skryť režim dokumentu"
:command.ui/toggle-settings "Prepnúť nastavenia"
:command.ui/toggle-right-sidebar "Zobraziť/Skryť pravý bočný panel"
:command.ui/toggle-left-sidebar "Zobraziť/Skryť ľavý bočný panel"
:command.ui/toggle-help "Zobraziť/Skryť pomocníka"
:command.ui/toggle-theme "Prepínať medzi tmavým/svetlým motívom"
:command.ui/toggle-contents "Zobraziť/Skryť obsah na bočnom paneli"
:command.command/toggle-favorite "Pridať/Odstrániť z obľúbených"
:command.editor/open-file-in-default-app "Otvoriť súbor v predvolenej aplikácii"
:command.editor/open-file-in-directory "Otvoriť súbor v nadradenom adresári"
:command.editor/copy-current-file "Skopírovať aktuálny súbor"
:command.ui/toggle-wide-mode "Prepnúť širokouhlý režim"
:command.ui/select-theme-color "Vyberte dostupné farby motívu"
:command.ui/goto-plugins "Prejsť na zoznam doplnkov"
:command.ui/install-plugins-from-file "Inštalovať doplnky z plugins.edn"
:command.editor/toggle-open-blocks "Prepnúť otvorené bloky (zbaliť alebo rozbaliť všetky bloky)"
:command.ui/toggle-cards "Zobraziť/Skryť karty"
:command.git/commit "Spusiť príkaz git commit so správou"})
4 changes: 1 addition & 3 deletions src/main/frontend/dicts/uk.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,7 @@
:file-sync/other-user-graph "Поточний локальний графік зв'язаний з графіком іншого користувача. Тому неможливо почати синхронізацію."
:file-sync/graph-deleted "Поточний дистанційний графік був видалений"

:notification/clear-all "Очистити все"

:tongue/fallback :en})
:notification/clear-all "Очистити все"})

(def shortcuts
{:shortcut.category/formatting "Форматування"
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/extensions/pdf/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[frontend.extensions.pdf.windows :as pdf-windows]
[frontend.handler.notification :as notification]
[frontend.config :as config]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.commands :as commands]
[frontend.rum :refer [use-atom]]
[frontend.state :as state]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/extensions/srs.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[cljs-time.coerce :as tc]
[clojure.string :as string]
[rum.core :as rum]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[medley.core :as medley]))

;;; ================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/handler.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
[frontend.modules.instrumentation.core :as instrument]
[frontend.modules.outliner.datascript :as outliner-db]
[frontend.modules.outliner.file :as file]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.state :as state]
[frontend.ui :as ui]
[frontend.util :as util]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/handler/events.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
[frontend.modules.instrumentation.posthog :as posthog]
[frontend.modules.instrumentation.sentry :as sentry-event]
[frontend.modules.outliner.file :as outliner-file]
[frontend.modules.shortcut.dicts :as st]
[frontend.modules.shortcut.core :as st]
[frontend.quick-capture :as quick-capture]
[frontend.search :as search]
[frontend.state :as state]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/mobile/graph_picker.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[frontend.handler.web.nfs :as web-nfs]
[frontend.handler.page :as page-handler]
[frontend.util :as util]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.state :as state]
[frontend.mobile.util :as mobile-util]
[frontend.fs :as fs]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/publishing.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
[frontend.components.page :as page-component]
[frontend.components.reference :as reference]
[frontend.components.whiteboard :as whiteboard]
[frontend.modules.shortcut.dicts :as shortcut]
[frontend.modules.shortcut.core :as shortcut]
[frontend.handler.events :as events]
[frontend.handler.command-palette :as command-palette]))

Expand Down
Loading

0 comments on commit 0434a2b

Please sign in to comment.