Add language picker #143

cblgh · 2021-04-13T14:55:14Z

Closes #45

tasks

staltz · 2021-04-13T15:02:01Z

@cblgh Can you put this PR in draft mode to indicate its readiness?

cblgh · 2021-04-15T09:04:29Z

web/i18n/defaults/active.en.toml

@@ -1,5 +1,8 @@
 # default localiztion file for english

+# the name of this language, in its language. Used for language picking
+LanguageName = "English"


this new key LanguageName is used for populating the language picker (the list of languages in the page footer). it would be a good idea to document the translation key alongside other instructions for adding translations to the existing room

cblgh · 2021-04-16T07:04:50Z

this is the test failure i am seeing on my machine:

635.162497ms unit=tunnel called=endpoints
/home/cblgh/code/go/src/go-ssb-room/muxrpc/test/nodejs/testscripts/modern_aliases.js:12
      sbot.roomClient.registerAlias(rpc.id, "alice", (err, ret) => {
                      ^

TypeError: Cannot read property 'registerAlias' of undefined
    at Timeout._onTimeout (/home/cblgh/code/go/src/go-ssb-room/muxrpc/test/nodejs/testscripts/modern_aliases.js:12:23)
    at listOnTimeout (internal/timers.js:554:17)
    at processTimers (internal/timers.js:497:7)
level=debug t=5.541728553s event="network listen loop exited"
level=debug t=5.542631243s event="tunserv closing" msg="connections closed"
level=info t=5.542693387s event="tunserv closing" msg="closers closed"
--- FAIL: TestGoServerJSClientAliases (5.54s)
    setup_test.go:131: go server: @7j2jowwuHPQd5YRes3smYRKNrd3+uKteXdILPzjBfYQ=.ed25519
    setup_test.go:161: starting client alice
    setup_test.go:217: JS alice:1 @yVFwS8u/+Uiu6I1eJbfBaQtx70EVmrwnhSCmYO6Iy3k=.ed25519
    setup_test.go:199: node client alice: exited with exit status 1 (after 1.592460342s)
    setup_test.go:280: 
        	Error Trace:	setup_test.go:280
        	            				aliases_test.go:45
        	Error:      	Received unexpected error:
        	            	node client alice exited with exit status 1
        	Test:       	TestGoServerJSClientAliases
    aliases_test.go:47: 
        	Error Trace:	aliases_test.go:47
        	Error:      	Not equal: 
        	            	expected: 1
        	            	actual  : 0
        	Test:       	TestGoServerJSClientAliases
        	Messages:   	register call count
    setup_test.go:133: bot close: <nil>

cblgh · 2021-04-16T07:05:52Z

working in parallel on the default language admin settings, it's uncovered some additions i need to make to the template function list_languages :)

cryptix · 2021-04-16T07:43:59Z

re the test failure, i just checked out your branch and couldn't reproduce. I suspect the npm deps changed.

Try running cd muxrpc/test/nodejs && npm ci && go test -run TestGoServerJSClientAliases

staltz · 2021-04-16T07:52:03Z

The test failure means that ssb-room-client wasn't installed properly, so just double check that it's in node_modules, the version is the latest, and in secret-stack we're doing the .use(require('ssb-room-client'))

cblgh · 2021-04-16T13:50:38Z

ship this german translation PRONTO

cblgh · 2021-04-16T15:30:21Z

ok, all that's remaining then is

fix /set-language only working on non-admin pages (bizarre csrf error)

cryptix · 2021-04-19T12:15:39Z

Totally orthogonal but before we need yet another migration, can you add another bool to the settings table for #160 ?

column name use_subdomain_for_aliases and default it to 1.

Update models please and I will add the functions on the roomdb interfaces myself later. Just don't want to touch that migration file again.

cblgh · 2021-04-19T12:52:12Z

@cryptix gotcha! will do this after the current batch of work i'm doing :)

cblgh · 2021-04-19T14:32:52Z

5a15cab look alright @cryptix?

i18n.ListLanguages() returns a map, mapping language tags ('en', 'sv') to the names of their corresponding languages (as translated by the language itself). This functionality will be used in the language picker, to present a nice list of the translated languages. I renamed testing.go to conform to go's testing conventions, and added a test for i18n.ListLanguages().

while working on the /set-language route, i noticed that i was getting a csrf error for all /admin views when setting the language, while it worked well on non-admin routes. the issue, it turned out, was that we needed to configure gorilla's csrf feature to set all cookies on the same route. when unconfigured, the set cookies will only be set for the path they are being set at. see more in the gorilla.csrf documentation (in particular the csrf.Path option): https://pkg.go.dev/github.com/gorilla/csrf?utm_source=godoc#Path

to make sure the list of languages is sorted, we now use a slice of TagTranslation{Tag: string, Translation: string} structs, sorted by `TagTranslation.Tag`.

related to #160, requested by cryptix

cryptix

Some nagging but really like the substance! Good for merge after these changes.

roomdb/sqlite/roomconfig.go

web/handlers/admin/set_language_test.go

web/handlers/admin/settings.go

web/handlers/http.go

web/handlers/invites_test.go

web/handlers/notices_test.go

web/handlers/set_language_test.go

cblgh · 2021-04-20T07:56:58Z

Thanks for the code review @cryptix! I'll get on implementing the remaining changes & fixing the tests :)

Co-authored-by: Henry <111202+cryptix@users.noreply.github.com> use eh.Handle

cryptix

Very nice now! LGTM

cblgh force-pushed the language-picking branch from 702d386 to 9f88cab Compare April 13, 2021 14:55

cblgh marked this pull request as draft April 13, 2021 15:06

cblgh force-pushed the language-picking branch from 0c1e9b9 to 5aa43b9 Compare April 14, 2021 09:10

cblgh commented Apr 15, 2021

View reviewed changes

cblgh force-pushed the language-picking branch from 151408d to 2e532c2 Compare April 16, 2021 15:26

cryptix mentioned this pull request Apr 19, 2021

registerAlias should return wildcard subdomain URL #160

Closed

cblgh marked this pull request as ready for review April 19, 2021 19:13

cblgh added 9 commits April 20, 2021 09:09

add language picker element mock

cb3feb2

add template func for listing languages

9863c6b

set & use language cookie

f535aa8

redirect with 303 See Other

93f84e0

don't render language picker if we have less than 2 translations

ee185e5

mock injected functions for tests

6822833

improve api comment for ListLanguages

534bdfc

bump ssb-room-client & package-lock

e941e10

cblgh force-pushed the language-picking branch from 8fdabe5 to cbbe9d5 Compare April 20, 2021 07:20

cblgh added 3 commits April 20, 2021 09:22

add default language admin ui functionality

c97b7d4

add de translation, use []TagTranslation, and sort

7759e8f

to make sure the list of languages is sorted, we now use a slice of TagTranslation{Tag: string, Translation: string} structs, sorted by `TagTranslation.Tag`.

cblgh added 3 commits April 20, 2021 09:22

make tests more robust when validating specific csrf token

1c5c0b9

add flag for toggling usage of alias subdomains

8d1f790

related to #160, requested by cryptix

test language picking

0574c9a

cblgh force-pushed the language-picking branch from cbbe9d5 to 0574c9a Compare April 20, 2021 07:23

cryptix requested changes Apr 20, 2021

View reviewed changes

cblgh added 2 commits April 20, 2021 10:36

Apply suggestions from code review

a5f7701

Co-authored-by: Henry <111202+cryptix@users.noreply.github.com> use eh.Handle

use more robust identifier for test

c607733

cblgh force-pushed the language-picking branch 4 times, most recently from 42f6cce to a159108 Compare April 20, 2021 09:45

rewrite list_languages function to use html/template

16985bb

cblgh force-pushed the language-picking branch from a159108 to 16985bb Compare April 20, 2021 09:49

cryptix approved these changes Apr 20, 2021

View reviewed changes

cblgh merged commit 2007c73 into master Apr 20, 2021

cblgh deleted the language-picking branch April 20, 2021 09:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add language picker #143

Add language picker #143

cblgh commented Apr 13, 2021 •

edited

Loading

staltz commented Apr 13, 2021

cblgh Apr 15, 2021 •

edited

Loading

cblgh commented Apr 16, 2021

cblgh commented Apr 16, 2021

cryptix commented Apr 16, 2021

staltz commented Apr 16, 2021

cblgh commented Apr 16, 2021

cblgh commented Apr 16, 2021 •

edited

Loading

cryptix commented Apr 19, 2021 •

edited

Loading

cblgh commented Apr 19, 2021

cblgh commented Apr 19, 2021

cryptix left a comment

cblgh commented Apr 20, 2021

cryptix left a comment

Add language picker #143

Add language picker #143

Conversation

cblgh commented Apr 13, 2021 • edited Loading

staltz commented Apr 13, 2021

cblgh Apr 15, 2021 • edited Loading

Choose a reason for hiding this comment

cblgh commented Apr 16, 2021

cblgh commented Apr 16, 2021

cryptix commented Apr 16, 2021

staltz commented Apr 16, 2021

cblgh commented Apr 16, 2021

cblgh commented Apr 16, 2021 • edited Loading

cryptix commented Apr 19, 2021 • edited Loading

cblgh commented Apr 19, 2021

cblgh commented Apr 19, 2021

cryptix left a comment

Choose a reason for hiding this comment

cblgh commented Apr 20, 2021

cryptix left a comment

Choose a reason for hiding this comment

cblgh commented Apr 13, 2021 •

edited

Loading

cblgh Apr 15, 2021 •

edited

Loading

cblgh commented Apr 16, 2021 •

edited

Loading

cryptix commented Apr 19, 2021 •

edited

Loading