Chore (i18n): Make punctuation usage consistent in translations #9610

sprocketc · 2023-06-08T14:02:10Z

Light refactoring related to translations (mostly), cherry picked from #8722

logseq-cldwalker

@sprocketc Nice cleanup. Just the "..." to address before merging

logseq-cldwalker · 2023-06-08T14:25:23Z

src/main/frontend/components/page.cljs

@@ -1041,15 +1041,15 @@
         [:div.r.flex.items-center.justify-between
          [:div
           (ui/tippy
-            {:html  [:small (str (t :page/show-whiteboards) " ?")]


Forgot to bring in the old comments. See #8722 (comment)
Punctuation should be part of the translation (also see #8722 (comment) that didn't make it into this PR). The question mark is superfluous in this case, so removing it is a better option in my opinion, instead of invalidating the translations to include it.

Agree with this change. Just thought the original was funny.

Punctuation should be part of the translation

Agree with '?' and '!' but what about delimiting characters like ':' or '-'? Moving those characters into translation will likely make it easier to forget to delimit in some languages. Grep for '(str (t' for examples. Whatever we decide we should document in the translation guide and if possible remove counter examples

Forgetting to delimit could happen, but having the ability to properly translate the app should be our top priority in my opinion. RTL languages is also something that we need to take into account. I think @sawhney17 implemented a plugin, but I didn't have the chance to test it yet.

we should document in the translation guide and if possible remove counter examples

💯

Forgetting to delimit could happen, but having the ability to properly translate the app should be the top priority in my opinion

Seems reasonable. Could you remove some of the counter examples from the above grep and document the punctation guidance?

Replaced all (str (t instances and invalidated the previous translations . We still have to fix some remaining cases (grep " (t ). When all of these are fixed, it might be a good idea to update our linter. I added a note to dev-practices.md for now.

Thanks. 👍

logseq-cldwalker · 2023-06-08T14:29:04Z

src/main/frontend/components/assets.cljs

@@ -215,7 +215,7 @@
             #(state/set-assets-alias-enabled! (not alias-enabled?))
             true)]
      [:span
-       (restart-button alias-enabled-changed?)]]
+       (when alias-enabled-changed? (restart-button))]]


logseq-cldwalker · 2023-06-08T14:37:37Z

src/main/frontend/ui.cljs

  ([content] (loading content nil))
  ([content opts]
   [:div.flex.flex-row.items-center.inline
    [:span.icon.flex.items-center (svg/loader-fn opts)
     (when-not (string/blank? content)
       [:span.text.pl-2 content])]]))

+(defn notify-graph-persist!


At some point it could be nice if non-components fns moved to another ns as this ns seems like it's outgrowing its primary purpose of providing reusable components

src/main/frontend/components/file.cljs

sprocketc · 2023-06-09T11:18:46Z

src/main/frontend/handler/page.cljs

-              prefix (str (t :new-page) ": ")
-              chosen (if (string/starts-with? chosen prefix) ;; FIXME: What if a page named "New page: XXX"?
-                       (string/replace-first chosen prefix "")
-                       chosen)


This should fix various issues related to page autocompletion with names starting with "New page" or parts of it (depends on the active language). For example, typing [[New]] would highlight the wrong New on the autocomplete component. Creating a reference starting with New page: could also lead to unexpected behavior.

The "new page" label is now handled on the custom item renderer of page-search
135e322#diff-804cdbc15af06aba05e572b8dcee83da9a495773a899aa35f8ce42bbaa6afce0R157-R159
Note that this has a minor performance cost, because we are checking if the page exists, for each search result

Nice that it fixes some issues but bummer that it adds another entity lookup call per item rendered. When I type within [[]] in lambda, I think the initial typing feels less responsive. If users notice then we can try to improve this

tiensonqin

Nice cleanup!

logseq-cldwalker

@sprocketc Thanks for making punctuation consistent across translations! 👍 🚢 Just have one question about deleting translations

logseq-cldwalker · 2023-06-13T15:55:15Z

src/resources/dicts/es.edn

@@ -77,7 +77,6 @@
 :file-rn/or-select-actions-2 ". Estas acciones no estarán disponibles una vez cierres este panel."
 :file-rn/legend "🟢 Acciones de cambio de nombre opcionales; 🟡 Cambio de nombre obligatorio para evitar el cambio de título; 🔴 Cambio destructor."
 :file-rn/close-panel "Cerrar el panel"
- :file-rn/all-action "¡Aplicar todas las acciones!"


Were all these entries that had punctuation removed because you think some of them may choose different punctuation? Seemed like most of these would've just used the same ones e.g. append ({1}) for this one

Chatted with Konstantinos and these were removed since some languages may have the arguments in different positions

logseq-cldwalker · 2023-06-13T16:25:48Z

src/resources/dicts/en.edn

@@ -116,7 +116,7 @@
 :file-rn/or-select-actions-2 ". These actions are not available once you close this panel."
 :file-rn/legend "🟢 Optional rename actions; 🟡 Rename action required to avoid title change; 🔴 Breaking change."
 :file-rn/close-panel "Close the Panel"
- :file-rn/all-action "Apply all Actions!"
+ :file-rn/all-action "Apply all Actions! ({1})"


This is the first time we've used arguments so I've added something about this to the guide

logseq-cldwalker · 2023-06-13T16:27:34Z

src/main/frontend/components/page.cljs

@@ -1041,15 +1041,15 @@
         [:div.r.flex.items-center.justify-between
          [:div
           (ui/tippy
-            {:html  [:small (str (t :page/show-whiteboards) " ?")]


Thanks. 👍

logseq-cldwalker · 2023-06-13T16:36:08Z

src/main/frontend/handler/page.cljs

-              prefix (str (t :new-page) ": ")
-              chosen (if (string/starts-with? chosen prefix) ;; FIXME: What if a page named "New page: XXX"?
-                       (string/replace-first chosen prefix "")
-                       chosen)


Nice that it fixes some issues but bummer that it adds another entity lookup call per item rendered. When I type within [[]] in lambda, I think the initial typing feels less responsive. If users notice then we can try to improve this

queeup · 2023-06-16T17:27:48Z

@sprocketc, I just realize my language have many untranslated words. Then I checked it and found out you are adding just : or ´!´ most of the time and erase all strings on the other languages. Please do not do that. If its just a small change like them add it to the other language to instead erasing the sentences.

sprocketc · 2023-06-16T17:47:27Z

@queeup I am sorry for the inconvenience. The point of this change was to avoid making assumptions about punctuation without further knowledge. I understand that in most languages simply adding the same punctuation would be correct, but that's not the case for every single language. The only way to be sure about this, was to make contributors like you reevaluate the translations. If you can guarantee that for a specific language, all cases of this PR can be reintroduced, I can fix this myself. We need a way (usually your help) to verify that.

queeup · 2023-06-16T17:51:16Z

You are right about most of the cases. Anyways don't worry about it. I just wanted to tell you about this. I will correct it and send a PR with new translations. I can check the other PR's and copy/past/correct.

chore: refactoring

d13ba8d

github-actions bot added the :type/dev This label is used to indicate that an issue or PR is related to development tasks or changes that label Jun 8, 2023

sprocketc requested a review from logseq-cldwalker June 8, 2023 14:02

logseq-cldwalker requested changes Jun 8, 2023

View reviewed changes

sprocketc added the :type/hold Hold this PR. won't merge for now label Jun 8, 2023

sprocketc added 4 commits June 9, 2023 13:54

fix: translations

135e322

fix: typo

3bcd6ac

fix: linter warning

0af72a8

update loading translation

5d696b2

sprocketc commented Jun 9, 2023

View reviewed changes

sprocketc added 7 commits June 12, 2023 12:31

Merge branch 'master' into chore/i18n-refactoring

4d95493

update dev practices

7c17f4d

fix a11y e2e test timeout

3efd0ff

fix e2e tests

aacbfa4

fix: e2e test

ab8de65

revert change

236142c

fix: typo

516d988

sprocketc requested a review from logseq-cldwalker June 12, 2023 14:30

tiensonqin approved these changes Jun 13, 2023

View reviewed changes

logseq-cldwalker removed the :type/hold Hold this PR. won't merge for now label Jun 13, 2023

Add tips for new editing conventions introduced in PR

cf7fd0f

logseq-cldwalker changed the title ~~Chore (i18n): Refactoring~~ Chore (i18n): Make punctuation usage consistent in translations Jun 13, 2023

logseq-cldwalker approved these changes Jun 13, 2023

View reviewed changes

logseq-cldwalker merged commit f051790 into master Jun 13, 2023
12 of 13 checks passed

logseq-cldwalker deleted the chore/i18n-refactoring branch June 13, 2023 16:55

demaldoror mentioned this pull request Jun 13, 2023

Enhance: Improve Russian (ru) translations #9645

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore (i18n): Make punctuation usage consistent in translations #9610

Chore (i18n): Make punctuation usage consistent in translations #9610

sprocketc commented Jun 8, 2023 •

edited

logseq-cldwalker left a comment

logseq-cldwalker Jun 8, 2023

sprocketc Jun 8, 2023

logseq-cldwalker Jun 8, 2023

sprocketc Jun 8, 2023 •

edited

logseq-cldwalker Jun 8, 2023

sprocketc Jun 12, 2023 •

edited

logseq-cldwalker Jun 13, 2023

logseq-cldwalker Jun 8, 2023

logseq-cldwalker Jun 8, 2023

sprocketc Jun 9, 2023 •

edited

logseq-cldwalker Jun 13, 2023

tiensonqin left a comment

logseq-cldwalker left a comment

logseq-cldwalker Jun 13, 2023

logseq-cldwalker Jun 13, 2023

logseq-cldwalker Jun 13, 2023

logseq-cldwalker Jun 13, 2023

logseq-cldwalker Jun 13, 2023

queeup commented Jun 16, 2023

sprocketc commented Jun 16, 2023 •

edited

queeup commented Jun 16, 2023

Chore (i18n): Make punctuation usage consistent in translations #9610

Chore (i18n): Make punctuation usage consistent in translations #9610

Conversation

sprocketc commented Jun 8, 2023 • edited

logseq-cldwalker left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sprocketc Jun 8, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sprocketc Jun 12, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sprocketc Jun 9, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tiensonqin left a comment

Choose a reason for hiding this comment

logseq-cldwalker left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

queeup commented Jun 16, 2023

sprocketc commented Jun 16, 2023 • edited

queeup commented Jun 16, 2023

sprocketc commented Jun 8, 2023 •

edited

sprocketc Jun 8, 2023 •

edited

sprocketc Jun 12, 2023 •

edited

sprocketc Jun 9, 2023 •

edited

sprocketc commented Jun 16, 2023 •

edited