This commit is contained in:
Mayel de Borniol 2022-05-30 17:08:48 +12:00
parent 6f5f4e297d
commit 7532853c92
6 changed files with 14 additions and 14 deletions

View file

@ -1,5 +1,6 @@
{
"version": "0.0.0",
"license": "AGPL-3.0",
"scripts": {
"watch.assets": "cpx 'static/**/*' ../priv/static --watch",
"prepare.static": "mkdir -p ../priv/static/ && cp -r static/*.ico ../priv/static/ && cp -r static/images ../priv/static/",

View file

@ -8,9 +8,10 @@ config :bonfire_common,
# internationalisation
config :bonfire_common, Bonfire.Common.Localise.Cldr,
default_locale: default_locale,
locales: ["fr", "en", "es"], # locales that will be made available on top of those for which gettext localisation files are available
locales: [default_locale, "es"], # locales that will be made available on top of those for which gettext localisation files are found
providers: [Cldr.Language],
gettext: Bonfire.Common.Localise.Gettext,
extra_gettext: [Timex.Gettext], # extra Gettex modules from dependencies not using the one from Bonfire.Common, so we can change their locale too
data_dir: "./priv/cldr",
add_fallback_locales: true,
# precompile_number_formats: ["¤¤#,##0.##"],

View file

@ -496,7 +496,7 @@ licenses:
# Extract strings to-be-localised from the app and installed extensions
localise-extract:
@just mix "bonfire.localise.extract --merge"
@just mix "bonfire.localise.extract"
assets-prepare:
@cp lib/*/*/overlay/* rel/overlays/ 2> /dev/null || true

View file

@ -30,6 +30,7 @@ defmodule Bonfire.Web.HomeLive do
sidebar_widgets: [
users: [
main: [
{Bonfire.UI.Common.HomeBannerLive, []},
{Bonfire.UI.Me.WidgetAdminsLive, []}
],
secondary: [
@ -39,6 +40,7 @@ defmodule Bonfire.Web.HomeLive do
],
guests: [
main: [
{Bonfire.UI.Common.HomeBannerLive, []},
{Bonfire.UI.Me.WidgetAdminsLive, []}
],
secondary: [

View file

@ -18,12 +18,7 @@ defmodule Bonfire.Web.Router do
plug :accepts, ["html", "activity+json", "json", "ld+json"]
plug PhoenixGon.Pipeline,
assets: Map.new(Config.get(:js_config, []))
plug Cldr.Plug.SetLocale,
default: Bonfire.Common.Localise.default_locale,
apps: [:cldr, :gettext],
from: [:session, :cookie, :accept_language],
gettext: Bonfire.Common.Localise.Gettext,
cldr: Bonfire.Common.Localise.Cldr
plug Cldr.Plug.SetLocale, Bonfire.Common.Localise.set_locale_config()
plug :fetch_live_flash
plug :protect_from_forgery
plug :put_secure_browser_headers

View file

@ -4,7 +4,7 @@
"absinthe_error_payload": {:hex, :absinthe_error_payload, "1.1.4", "502ff239148c8deaac028ddb600d6502d5be68d24fece0c93f4c3cf7e74c1a4d", [:make, :mix], [{:absinthe, "~> 1.3", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "9e262ef2fd4a2c644075e0cdde2573b1f713c0676ab905c8640eaa8a882b2aca"},
"absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
"absinthe_plug": {:hex, :absinthe_plug, "1.5.8", "38d230641ba9dca8f72f1fed2dfc8abd53b3907d1996363da32434ab6ee5d6ab", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"},
"activity_pub": {:git, "https://github.com/bonfire-networks/activity_pub", "a03a112ca48d8289b68c13ed12ac46fbb438494d", [branch: "develop"]},
"activity_pub": {:git, "https://github.com/bonfire-networks/activity_pub", "daf2e53bed2214624eaf1585ab98672be49cdbd4", [branch: "develop"]},
"argon2_elixir": {:hex, :argon2_elixir, "2.4.1", "edb27bdd326bc738f3e4614eddc2f73507be6fedc9533c6bcc6f15bbac9c85cc", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "0e21f52a373739d00bdfd5fe6da2f04eea623cb4f66899f7526dd9db03903d9f"},
"arrows": {:git, "https://github.com/bonfire-networks/arrows", "bfd904d9c4d1439b0feefafa771ee74661a4c8a4", [branch: "main"]},
"bamboo": {:hex, :bamboo, "2.2.0", "f10a406d2b7f5123eb1f02edfa043c259db04b47ab956041f279eaac776ef5ce", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "8c3b14ba7d2f40cb4be04128ed1e2aff06d91d9413d38bafb4afccffa3ade4fc"},
@ -26,7 +26,7 @@
"bonfire_data_social": {:git, "https://github.com/bonfire-networks/bonfire_data_social", "85ac53698e13267a2580e3ec3d5e5409d6881888", [branch: "main"]},
"bonfire_ecto": {:git, "https://github.com/bonfire-networks/bonfire_ecto", "88ad2c495c07a33d7df0f0b825e96c2b9cf1f2e0", [branch: "main"]},
"bonfire_editor_ck": {:git, "https://github.com/bonfire-networks/bonfire_editor_ck", "33e15f6b1aeb63046a223c0f3ed9423994390d52", [branch: "main"]},
"bonfire_editor_quill": {:git, "https://github.com/bonfire-networks/bonfire_editor_quill", "b1156beca48e189d1a2e36d9e5e1c82c34caac6b", [branch: "main"]},
"bonfire_editor_quill": {:git, "https://github.com/bonfire-networks/bonfire_editor_quill", "7d17ec991931fa0dd021a8e1b1064d4ca66b2f70", [branch: "main"]},
"bonfire_epics": {:git, "https://github.com/bonfire-networks/bonfire_epics", "34300053dbafa9b9cfede22bd4e6433d04344b69", [branch: "main"]},
"bonfire_fail": {:git, "https://github.com/bonfire-networks/bonfire_fail", "4ce2a1254c68388f8877e1c86dfd782a773600ea", [branch: "main"]},
"bonfire_federate_activitypub": {:git, "https://github.com/bonfire-networks/bonfire_federate_activitypub", "aace35e90a3395beee0104edb31bdbb1ec515c19", [branch: "main"]},
@ -38,14 +38,14 @@
"bonfire_open_id": {:git, "https://github.com/bonfire-networks/bonfire_open_id", "acfba1cd060b8307c2def9bcb08ecb76dd9f4aaf", [branch: "main"]},
"bonfire_quantify": {:git, "https://github.com/bonfire-networks/bonfire_quantify", "bbfa8bac5d16ebf9a58b0e98ebd60f4423e8e570", [branch: "main"]},
"bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "ef29bd9dc547543ffcdd1ab14f65eb75e36efdb4", [branch: "main"]},
"bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "a99b76c8a6edc00b70d7d9d87e6046d119365206", [branch: "main"]},
"bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "a3e885585e10738477de13e2f84ce919441a280a", [branch: "main"]},
"bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "b98f063f530f149b7bd5db4dfa37c663fbfb31cc", [branch: "main"]},
"bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "173debf22a7b9221cdbc832615516fb2cd1e458e", [branch: "main"]},
"bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "433cd13340ba5c27bc50641172e9be9c7a636520", [branch: "main"]},
"bonfire_ui_coordination": {:git, "https://github.com/bonfire-networks/bonfire_ui_coordination", "40b24b68b542c31a0c99be2650b8148c5ad01161", [branch: "main"]},
"bonfire_ui_kanban": {:git, "https://github.com/bonfire-networks/bonfire_ui_kanban", "69f42c5c38e5d63e4e60b4ef8d0191224c297b14", [branch: "main"]},
"bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "5d98395d5bfe28070f22277ea2efed904f14c51e", [branch: "main"]},
"bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "b83c62ba64d123db70a9723b4ee107dc2a52602a", [branch: "main"]},
"bonfire_ui_reflow": {:git, "https://github.com/bonfire-networks/bonfire_ui_reflow", "befd9ccb3b28b1e46e4a485deb493a041fde181b", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "d36a5b28da74abfaece010aa8afa8ee9033273fe", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "1d8cc0f1e6d0c6cb1b453464829c7d8500299b3b", [branch: "main"]},
"bonfire_ui_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_ui_valueflows", "1b767e92009a9d82f5f258c9f8b415a8ee0c73c8", [branch: "main"]},
"bonfire_upcycle": {:git, "https://gitlab.com/bonfire-networks/bonfire_upcycle", "bb3fb7f2ad8664290913cf0d76f877b7aac2f269", [branch: "master"]},
"bonfire_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_valueflows", "83d9148c94f876e946f6deba1fc67cfbbda6fd72", [branch: "main"]},
@ -89,6 +89,7 @@
"ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
"ex_ulid": {:hex, :ex_ulid, "0.1.0", "e6e717c57344f6e500d0190ccb4edc862b985a3680f15834af992ec065d4dcff", [:mix], [], "hexpm", "a2befd477aebc4639563de7e233e175cacf8a8f42c8f6778c88d60c13bf20860"},
"ex_unit_notifier": {:hex, :ex_unit_notifier, "1.2.0", "73ced2ecee0f2da0705e372c21ce61e4e5d927ddb797f73928e52818b9cc1754", [:mix], [], "hexpm", "f38044c9d50de68ad7f0aec4d781a10d9f1c92c62b36bf0227ec0aaa96aee332"},
"expo": {:hex, :expo, "0.1.0-beta.5", "030bc9421b6412245c32e2768a5ede54c8d9873476d395d59e182d8330e78ec6", [:mix], [{:nimble_parsec, "~> 1.2", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "886efc521a924c26c59cbddd6fd5855985d0e88a62ce13ccb6c5cff2a15bf72d"},
"exsync": {:hex, :exsync, "0.2.4", "5cdc824553e0f4c4bf60018a9a6bbd5d3b51f93ef8401a0d8545f93127281d03", [:mix], [{:file_system, "~> 0.2", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "f7622d8bb98abbe473aa066ae46f91afdf7a5346b8b89728404f7189d2e80896"},
"faker": {:hex, :faker, "0.17.0", "671019d0652f63aefd8723b72167ecdb284baf7d47ad3a82a15e9b8a6df5d1fa", [:mix], [], "hexpm", "a7d4ad84a93fd25c5f5303510753789fc2433ff241bf3b4144d3f6f291658a6a"},
"fast_ngram": {:hex, :fast_ngram, "1.2.0", "0652c25d3f66e69e6780121cf19200442fe70da689b39ccaa8998da6ee2f65cc", [:mix], [], "hexpm", "90c949c5b00314d8117a5bf2fbf6a05ef945ce4cad66a47bc26f8d9ec30dc1bd"},