Bläddra i källkod

Translate two translations that weren't usable by all langs

See #9716. Position matters for some langs like Turkish
Gabriel Horner 2 år sedan
förälder
incheckning
43df7dfd9a

+ 1 - 0
docs/contributing-to-translations.md

@@ -84,6 +84,7 @@ Almost all translations are small. The only exceptions to this are the keys `:tu
 
 * Some translations may include punctuation like `:` or `!`. When translating them, please use the punctuation that makes the most sense for your language as you don't have to follow the English ones.
 * Some translations may include arguments/interpolations e.g. `{1}`. If you see them in a translation, be sure to include them. These arguments are substituted in the string and are usually used something the app needs to calculate e.g. a number. See [these docs](https://github.com/tonsky/tongue#interpolation) for more examples.
+* Rarely, a translation may need to translate formatted text by returning [hiccup-style HTML](https://github.com/weavejester/hiccup#syntax). In this case, a Clojure function is the recommended approach. For example, a function translation would look like `(fn [] [:div "FOO"])`. See `:on-boarding/main-title` for an example.
 ## Fix Mistakes
 
 There is a lint command to catch common translation mistakes - `bb

+ 3 - 3
src/main/frontend/components/onboarding/setups.cljs

@@ -19,7 +19,7 @@
             [clojure.string :as string]
             [goog.object :as gobj]))
 
-(defonce DEVICE (if (util/mobile?) "phone" "computer"))
+(def DEVICE (if (util/mobile?) (t :on-boarding/section-phone) (t :on-boarding/section-computer)))
 
 (rum/defc setups-container
   [flag content]
@@ -30,7 +30,7 @@
 
       [:h1.text-xl
        (if picker?
-         [:span [:strong (ui/icon "heart")] (t :on-boarding/main-title) [:strong "Logseq!"]]
+         [:span [:strong (ui/icon "heart")] (t :on-boarding/main-title)]
          [:span [:strong (ui/icon "file-import")] (t :on-boarding/importing-main-title)])]
 
       [:h2
@@ -106,7 +106,7 @@
          [:small.opacity-60 (t :on-boarding/section-desc)]]]
 
        [:p.text-sm.pt-5.tracking-wide
-        [:span (str (t :on-boarding/section-tip-1) DEVICE ".")]
+        [:span (str (t :on-boarding/section-tip-1 DEVICE))]
         [:br]
         [:span (t :on-boarding/section-tip-2)]]
 

+ 6 - 4
src/resources/dicts/en.edn

@@ -44,17 +44,19 @@
  :on-boarding/importing-roam-desc "Import a JSON Export of your Roam graph"
  :on-boarding/importing-lsq-desc "Import an EDN or a JSON Export of your Logseq graph"
  :on-boarding/importing-opml-desc " Import OPML files"
- :on-boarding/main-title "Welcome to "
+ :on-boarding/main-title (fn [] ["Welcome to " [:strong "Logseq!"]])
  :on-boarding/main-desc "First you need to choose a folder where Logseq will store your thoughts, ideas, notes."
  :on-boarding/section-btn-title "Choose a folder"
  :on-boarding/section-btn-desc "Open existing directory or Create a new one"
  :on-boarding/section-title "How Logseq saves your work"
  :on-boarding/section-desc "Inside the directory you choose, Logseq will create 4 folders."
- :on-boarding/section-tip-1 "Each page is a file stored only on your "
+ :on-boarding/section-tip-1 "Each page is a file stored only on your {1}."
  :on-boarding/section-tip-2 "You may choose to sync it later."
  :on-boarding/section-assets "Graphics & Documents"
+ :on-boarding/section-computer "computer"
  :on-boarding/section-journals "Daily notes"
  :on-boarding/section-pages "PAGES"
+ :on-boarding/section-phone "phone"
  :on-boarding/section-app "APP Internal"
  :on-boarding/section-config "Config File"
  :bug-report/main-title "Bug report"
@@ -417,7 +419,7 @@
  :whiteboard/circle "Circle"
  :whiteboard/triangle "Triangle"
  :whiteboard/shape "Shape"
- :whiteboard/open-page "Open page" 
+ :whiteboard/open-page "Open page"
  :whiteboard/open-page-in-sidebar "Open page in sidebar"
  :whiteboard/remove-link "Remove link"
  :whiteboard/link "Link"
@@ -447,7 +449,7 @@
  :flashcards/modal-btn-show-clozes "Show clozes"
  :flashcards/modal-btn-next-card "Next"
  :flashcards/modal-btn-reset "Reset"
- :flashcards/modal-btn-reset-tip "Reset this card so that you can review it immediately." 
+ :flashcards/modal-btn-reset-tip "Reset this card so that you can review it immediately."
  :flashcards/modal-btn-forgotten "Forgotten"
  :flashcards/modal-btn-remembered "Remembered"
  :flashcards/modal-btn-recall "Took a while to recall"