<%= if @chat_editor.is_streaming do %>
-
◼ <%= translated("chat.stop") %>
+
◼ <%= dgettext("ui", "Stop") %>
<% end %>
diff --git a/lib/bds/desktop/shell_live/chat_surface.ex b/lib/bds/desktop/shell_live/chat_surface.ex
index c444b04..a8977fc 100644
--- a/lib/bds/desktop/shell_live/chat_surface.ex
+++ b/lib/bds/desktop/shell_live/chat_surface.ex
@@ -3,7 +3,7 @@ defmodule BDS.Desktop.ShellLive.ChatSurface do
import Phoenix.Component, only: [assign: 3]
- alias BDS.Desktop.ShellData
+ use Gettext, backend: BDS.Gettext
def assistant_turn(prompt, socket) do
[
@@ -12,12 +12,12 @@ defmodule BDS.Desktop.ShellLive.ChatSurface do
]
end
- def assistant_project_name(nil), do: translated("Projects")
+ def assistant_project_name(nil), do: dgettext("ui", "Projects")
def assistant_project_name(project), do: project.name
- def assistant_message_label("assistant"), do: translated("Assistant")
- def assistant_message_label("user"), do: translated("You")
- def assistant_message_label(_role), do: translated("Assistant")
+ def assistant_message_label("assistant"), do: dgettext("ui", "Assistant")
+ def assistant_message_label("user"), do: dgettext("ui", "You")
+ def assistant_message_label(_role), do: dgettext("ui", "Assistant")
def assistant_message_testid(role), do: "assistant-message-#{role}"
@@ -30,19 +30,9 @@ defmodule BDS.Desktop.ShellLive.ChatSurface do
defp assistant_reply(socket) do
if socket.assigns.offline_mode do
- ShellData.translate(
- "Automatic AI actions stay gated by airplane mode.",
- %{},
- socket.assigns.page_language
- )
+ BDS.Gettext.lgettext(socket.assigns.page_language, "ui", "Automatic AI actions stay gated by airplane mode.")
else
- ShellData.translate(
- "The assistant sidebar chat surface is ready, but model execution is not connected yet.",
- %{},
- socket.assigns.page_language
- )
+ BDS.Gettext.lgettext(socket.assigns.page_language, "ui", "The assistant sidebar chat surface is ready, but model execution is not connected yet.")
end
end
-
- defp translated(text), do: ShellData.translate(text, %{}, BDS.Desktop.UILocale.current())
end
diff --git a/lib/bds/desktop/shell_live/import_editor.ex b/lib/bds/desktop/shell_live/import_editor.ex
index 849c8b2..5d48fde 100644
--- a/lib/bds/desktop/shell_live/import_editor.ex
+++ b/lib/bds/desktop/shell_live/import_editor.ex
@@ -30,6 +30,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
translate_execution_phase: 1
]
+ use Gettext, backend: BDS.Gettext
import TaxonomyEditing,
only: [
existing_taxonomy_terms: 1,
@@ -162,7 +163,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
definition_id = socket.assigns.definition_id
socket =
- case FolderPicker.choose_directory(translated("importAnalysis.uploadsFolder")) do
+ case FolderPicker.choose_directory(dgettext("ui", "Uploads Folder")) do
{:ok, uploads_folder_path} ->
{:ok, _definition} =
ImportDefinitions.update_definition(definition_id, %{
@@ -175,7 +176,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
build_data(socket)
{:error, %{message: message}} ->
- notify_output(translated("activity.import"), message, "error")
+ notify_output(dgettext("ui", "Import"), message, "error")
build_data(socket)
end
@@ -187,7 +188,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
project_id = socket.assigns.project_id
socket =
- case FilePicker.choose_file(translated("importAnalysis.wxrFile")) do
+ case FilePicker.choose_file(dgettext("ui", "WXR File")) do
{:ok, wxr_file_path} ->
{:ok, definition} =
ImportDefinitions.update_definition(definition_id, %{
@@ -214,7 +215,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
socket
|> assign(:analysis_state, %{
loading: true,
- step: translated("importAnalysis.analyzingWxr"),
+ step: dgettext("ui", "Analyzing WXR file..."),
detail: Path.basename(wxr_file_path),
file_path: wxr_file_path,
ref: task.ref
@@ -226,7 +227,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
build_data(socket)
{:error, %{message: message}} ->
- notify_output(translated("activity.import"), message, "error")
+ notify_output(dgettext("ui", "Import"), message, "error")
build_data(socket)
end
@@ -430,12 +431,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
%{} = report <- ImportDefinitions.decode_analysis_result(definition) do
if socket.assigns.offline_mode? do
notify_output(
- translated("activity.import"),
- ShellData.translate(
- "Automatic AI actions stay gated by airplane mode.",
- %{},
- socket.assigns[:page_language] || ShellData.ui_language()
- ),
+ dgettext("ui", "Import"),
+ BDS.Gettext.lgettext(socket.assigns[:page_language] || ShellData.ui_language(), "ui", "Automatic AI actions stay gated by airplane mode."),
"info"
)
@@ -467,15 +464,15 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
mapped_count = TaxonomyEditing.auto_mapped_count(report, updated_report)
notify_output(
- translated("activity.import"),
- translated("importAnalysis.mappedCount", %{count: mapped_count}),
+ dgettext("ui", "Import"),
+ dgettext("ui", "%{count} mapped", count: mapped_count),
"info"
)
build_data(socket)
{:error, reason} ->
- notify_output(translated("activity.import"), inspect(reason), "error")
+ notify_output(dgettext("ui", "Import"), inspect(reason), "error")
build_data(socket)
end
end
@@ -552,7 +549,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
socket
|> assign(:analysis_state, default_analysis_state())
- |> notify_output(translated("activity.import"), message, "error")
+ |> notify_output(dgettext("ui", "Import"), message, "error")
match?(%{ref: ^ref}, socket.assigns.execution_state) and reason not in [:normal, :shutdown] ->
message = if is_binary(reason), do: reason, else: inspect(reason)
@@ -567,7 +564,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
ref: nil
})
)
- |> notify_output(translated("activity.import"), message, "error")
+ |> notify_output(dgettext("ui", "Import"), message, "error")
true ->
socket
@@ -630,11 +627,11 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
end
defp maybe_update_tab_meta(socket, name) do
- title = name || translated("importAnalysis.untitledImport")
+ title = name || dgettext("ui", "Untitled Import")
notify_parent(
{:import_editor_tab_meta, socket.assigns.definition_id, title,
- translated("importAnalysis.headerDescription")}
+ dgettext("ui", "Select a WordPress export file (WXR) and an uploads folder to analyze what would be imported.")}
)
socket
@@ -653,7 +650,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
end
end
- defp selected_model_label(nil, []), do: translated("importAnalysis.analyzeWith")
+ defp selected_model_label(nil, []), do: dgettext("ui", "Analyze with...")
defp selected_model_label(nil, [model | _rest]), do: model.name || model.id
defp selected_model_label(model_id, available_models) do
@@ -685,14 +682,14 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
socket
{:error, reason} ->
- notify_output(socket, translated("activity.import"), inspect(reason), "error")
+ notify_output(socket, dgettext("ui", "Import"), inspect(reason), "error")
end
{:error, %{message: message}} ->
- notify_output(socket, translated("activity.import"), message, "error")
+ notify_output(socket, dgettext("ui", "Import"), message, "error")
{:error, reason} ->
- notify_output(socket, translated("activity.import"), inspect(reason), "error")
+ notify_output(socket, dgettext("ui", "Import"), inspect(reason), "error")
end
end
@@ -713,8 +710,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
ref: nil
})
|> notify_output(
- translated("activity.import"),
- translated("importAnalysis.importComplete", %{count: previous_state.count}),
+ dgettext("ui", "Import"),
+ dgettext("ui", "Import completed successfully!", count: previous_state.count),
"info"
)
@@ -727,7 +724,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
error: message,
ref: nil
})
- |> notify_output(translated("activity.import"), message, "error")
+ |> notify_output(dgettext("ui", "Import"), message, "error")
{:error, reason} ->
message = inspect(reason)
@@ -740,7 +737,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
error: message,
ref: nil
})
- |> notify_output(translated("activity.import"), message, "error")
+ |> notify_output(dgettext("ui", "Import"), message, "error")
end
# Allow DB connections to settle before rebuilding
@@ -812,27 +809,27 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
class="import-definition-name"
type="text"
name="import_definition[name]"
- value={@import_editor.definition_name || translated("importAnalysis.untitledImport")}
- placeholder={translated("importAnalysis.namePlaceholder")}
+ value={@import_editor.definition_name || dgettext("ui", "Untitled Import")}
+ placeholder={dgettext("ui", "Import name...")}
/>
-
<%= translated("importAnalysis.headerDescription") %>
+
<%= dgettext("ui", "Select a WordPress export file (WXR) and an uploads folder to analyze what would be imported.") %>
-
<%= translated("importAnalysis.uploadsFolder") %>
+
<%= dgettext("ui", "Uploads Folder") %>
- <%= @import_editor.uploads_folder_path || translated("importAnalysis.noFolderSelected") %>
+ <%= @import_editor.uploads_folder_path || dgettext("ui", "No folder selected") %>
-
<%= translated("Open") %>
+
<%= dgettext("ui", "Open") %>
-
<%= translated("importAnalysis.wxrFile") %>
+
<%= dgettext("ui", "WXR File") %>
- <%= @import_editor.wxr_file_path || translated("importAnalysis.selectFileToAnalyze") %>
+ <%= @import_editor.wxr_file_path || dgettext("ui", "Select a file to analyze") %>
-
<%= translated("importAnalysis.selectAndAnalyze") %>
+
<%= dgettext("ui", "Select & Analyze") %>
@@ -840,7 +837,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
-
<%= @analysis_state.step || translated("importAnalysis.analyzingWxr") %>
+
<%= @analysis_state.step || dgettext("ui", "Analyzing WXR file...") %>
<%= if present?(@analysis_state.detail) do %>
<%= @analysis_state.detail %>
<% end %>
@@ -851,37 +848,37 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= if not is_nil(@report) and not @import_editor.is_loading do %>
- <%= translated("importAnalysis.site") %>
- <%= get_in(@report, [:site_info, :title]) || translated("importAnalysis.untitled") %>
+ <%= dgettext("ui", "Site") %>
+ <%= get_in(@report, [:site_info, :title]) || dgettext("ui", "Untitled") %>
- <%= translated("importAnalysis.url") %>
- <%= get_in(@report, [:site_info, :url]) || translated("importAnalysis.notAvailable") %>
+ <%= dgettext("ui", "URL") %>
+ <%= get_in(@report, [:site_info, :url]) || dgettext("ui", "N/A") %>
- <%= translated("importAnalysis.language") %>
- <%= get_in(@report, [:site_info, :language]) || translated("importAnalysis.notAvailable") %>
+ <%= dgettext("ui", "Language") %>
+ <%= get_in(@report, [:site_info, :language]) || dgettext("ui", "N/A") %>
- <%= translated("importAnalysis.file") %>
+ <%= dgettext("ui", "File") %>
<%= @import_editor.wxr_file_path |> to_string() |> Path.basename() %>
- <.stat_card label={translated("importAnalysis.posts")} stats={@report.post_stats} />
+ <.stat_card label={dgettext("ui", "posts")} stats={@report.post_stats} />
<%= if Map.get(@report, :other_stats) && Map.get(@report.other_stats, :total, 0) > 0 do %>
- <.other_stat_card label={translated("importAnalysis.other")} stats={@report.other_stats} />
+ <.other_stat_card label={dgettext("ui", "Other")} stats={@report.other_stats} />
<% end %>
- <.stat_card label={translated("importAnalysis.pages")} stats={@report.page_stats} />
- <.media_stat_card label={translated("importAnalysis.media")} stats={@report.media_stats} />
- <.taxonomy_stat_card label={translated("importAnalysis.categories")} stats={@report.category_stats} />
- <.taxonomy_stat_card label={translated("importAnalysis.tags")} stats={@report.tag_stats} />
+ <.stat_card label={dgettext("ui", "pages")} stats={@report.page_stats} />
+ <.media_stat_card label={dgettext("ui", "media")} stats={@report.media_stats} />
+ <.taxonomy_stat_card label={dgettext("ui", "Categories")} stats={@report.category_stats} />
+ <.taxonomy_stat_card label={dgettext("ui", "Tags")} stats={@report.tag_stats} />
<%= if Enum.any?(Map.get(@report, :date_distribution, [])) do %>
-
<%= translated("importAnalysis.dateDistribution") %>
+
<%= dgettext("ui", "Date Distribution") %>
<%= for row <- @report.date_distribution do %>
@@ -900,13 +897,13 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= if @execution_state.is_executing do %>
-
<%= @execution_state.phase || translated("importAnalysis.executionStarting") %>
+
<%= @execution_state.phase || dgettext("ui", "Starting...") %>
<%= if present?(@execution_state.detail) do %>
<%= @execution_state.detail %>
<% end %>
@@ -921,18 +918,18 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= if not @execution_state.is_executing and not @execution_state.completed do %>
- <%= translated("importAnalysis.readyToImport") %>
- <%= if @counts.tags > 0 do %><%= @counts.tags %> <%= translated("importAnalysis.tagsCategories") %> <% end %>
- <%= if @counts.posts > 0 do %><%= @counts.posts %> <%= translated("importAnalysis.posts") %> <% end %>
- <%= if @counts.media > 0 do %><%= @counts.media %> <%= translated("importAnalysis.media") %> <% end %>
- <%= if @counts.pages > 0 do %><%= @counts.pages %> <%= translated("importAnalysis.pages") %> <% end %>
+ <%= dgettext("ui", "Ready to import:") %>
+ <%= if @counts.tags > 0 do %><%= @counts.tags %> <%= dgettext("ui", "tags/categories") %> <% end %>
+ <%= if @counts.posts > 0 do %><%= @counts.posts %> <%= dgettext("ui", "posts") %> <% end %>
+ <%= if @counts.media > 0 do %><%= @counts.media %> <%= dgettext("ui", "media") %> <% end %>
+ <%= if @counts.pages > 0 do %><%= @counts.pages %> <%= dgettext("ui", "pages") %> <% end %>
<%= if @counts.total == 0 do %>
- <%= translated("importAnalysis.nothingToImport") %>
+ <%= dgettext("ui", "Nothing to Import") %>
<% else %>
- <%= translated("importAnalysis.importItems", %{count: @counts.total}) %>
+ <%= dgettext("ui", "Import %{count} Items", count: @counts.total) %>
<% end %>
@@ -940,56 +937,56 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= if @execution_state.completed do %>
- <%= translated("importAnalysis.importComplete", %{count: @execution_state.count || @counts.total}) %>
+ <%= dgettext("ui", "Import completed successfully!", count: @execution_state.count || @counts.total) %>
<% end %>
<%= if present?(@execution_state.error) do %>
- <%= translated("importAnalysis.importFailed", %{error: @execution_state.error}) %>
+ <%= dgettext("ui", "Import failed: %{error}", error: @execution_state.error) %>
<% end %>
<%= if Enum.any?(@post_conflicts) do %>
- <.conflict_section title={translated("importAnalysis.postSlugConflicts")} items={@post_conflicts} expanded={@sections.post_conflicts} section="post_conflicts" myself={@myself} />
+ <.conflict_section title={dgettext("ui", "Post Slug Conflicts")} items={@post_conflicts} expanded={@sections.post_conflicts} section="post_conflicts" myself={@myself} />
<% end %>
<%= if Enum.any?(@page_conflicts) do %>
- <.conflict_section title={translated("importAnalysis.pageSlugConflicts")} items={@page_conflicts} expanded={@sections.page_conflicts} section="page_conflicts" myself={@myself} />
+ <.conflict_section title={dgettext("ui", "Page Slug Conflicts")} items={@page_conflicts} expanded={@sections.page_conflicts} section="page_conflicts" myself={@myself} />
<% end %>
<%= if Enum.any?(@post_items) do %>
- <.post_detail_section title={translated("importAnalysis.postsWithCount", %{count: length(@post_items)})} items={@post_items} expanded={@sections.posts} section="posts" myself={@myself} />
+ <.post_detail_section title={dgettext("ui", "Posts (%{count})", count: length(@post_items))} items={@post_items} expanded={@sections.posts} section="posts" myself={@myself} />
<% end %>
<%= if Enum.any?(@other_items) do %>
- <.post_detail_section title={translated("importAnalysis.otherWithCount", %{count: length(@other_items)})} items={@other_items} expanded={@sections.other} section="other" show_type={true} myself={@myself} />
+ <.post_detail_section title={dgettext("ui", "Other (%{count})", count: length(@other_items))} items={@other_items} expanded={@sections.other} section="other" show_type={true} myself={@myself} />
<% end %>
<%= if Enum.any?(@detail_pages) do %>
- <.post_detail_section title={translated("importAnalysis.pagesWithCount", %{count: length(@detail_pages)})} items={@detail_pages} expanded={@sections.pages} section="pages" myself={@myself} />
+ <.post_detail_section title={dgettext("ui", "Pages (%{count})", count: length(@detail_pages))} items={@detail_pages} expanded={@sections.pages} section="pages" myself={@myself} />
<% end %>
<%= if Enum.any?(@detail_media) do %>
- <.media_detail_section title={translated("importAnalysis.mediaWithCount", %{count: length(@detail_media)})} items={@detail_media} expanded={@sections.media} section="media" myself={@myself} />
+ <.media_detail_section title={dgettext("ui", "Media (%{count})", count: length(@detail_media))} items={@detail_media} expanded={@sections.media} section="media" myself={@myself} />
<% end %>
<%= if Enum.any?(Map.get(@report.items, :categories, [])) or Enum.any?(Map.get(@report.items, :tags, [])) do %>
- <%= translated("importAnalysis.taxonomyTitle") %>
+ <%= dgettext("ui", "Categories & Tags") %>
<%= if @sections.taxonomy, do: "▾", else: "▸" %>
<%= if @sections.taxonomy do %>
-
<%= translated("importAnalysis.analyzeWith") %>
+
<%= dgettext("ui", "Analyze with...") %>
<%= if @import_editor.model_selector_open? do %>
<%= for model <- @import_editor.available_models do %>
- <%= model.provider_name || model.provider || translated("importAnalysis.unknown") %>: <%= model.name || model.id %>
+ <%= model.provider_name || model.provider || dgettext("ui", "Unknown") %>: <%= model.name || model.id %>
<% end %>
@@ -1000,12 +997,12 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= @import_editor.selected_model_label %>
-
<%= translated("importAnalysis.aiMappingHint") %>
+
<%= dgettext("ui", "AI will suggest mappings from new to existing items to avoid duplicates") %>
<.taxonomy_group
- title={translated("importAnalysis.categories")}
+ title={dgettext("ui", "Categories")}
items={Map.get(@report.items, :categories, [])}
suggestions={Map.get(@import_editor.taxonomy_terms, :categories, [])}
edit={@import_editor.taxonomy_edit}
@@ -1013,7 +1010,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
myself={@myself}
/>
<.taxonomy_group
- title={translated("importAnalysis.tags")}
+ title={dgettext("ui", "Tags")}
items={Map.get(@report.items, :tags, [])}
suggestions={Map.get(@import_editor.taxonomy_terms, :tags, [])}
edit={@import_editor.taxonomy_edit}
@@ -1029,14 +1026,14 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= if Enum.any?(Map.get(macros, :discovered, [])) do %>
- <%= translated("importAnalysis.macrosWithCount", %{count: macros.total || length(macros.discovered)}) %>
+ <%= dgettext("ui", "Macros (%{count})", count: macros.total || length(macros.discovered)) %>
<%= if @sections.macros, do: "▾", else: "▸" %>
<%= if @sections.macros do %>
- <%= translated("importAnalysis.mappedCount", %{count: macros.mapped_count || 0}) %>
- <%= translated("importAnalysis.unmappedCount", %{count: macros.unmapped_count || 0}) %>
+ <%= dgettext("ui", "%{count} mapped", count: macros.mapped_count || 0) %>
+ <%= dgettext("ui", "%{count} unmapped", count: macros.unmapped_count || 0) %>
<%= for macro <- macros.discovered do %>
@@ -1044,9 +1041,9 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= if Enum.any?(Map.get(macro, :usages, [])) do %>
@@ -1058,17 +1055,17 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= k %>=<%= v %>
<% end %>
<% else %>
- <%= translated("importAnalysis.noParameters") %>
+ <%= dgettext("ui", "(no parameters)") %>
<% end %>
- <%= translated("importAnalysis.macroUses", %{count: usage.count}) %>
+ <%= dgettext("ui", "%{count} uses", count: usage.count) %>
<% end %>
- <%= translated("importAnalysis.usedIn", %{items: Enum.join(Enum.take(macro.post_slugs, 5), ", "), more: if(length(macro.post_slugs) > 5, do: translated("importAnalysis.moreSuffix", %{count: length(macro.post_slugs) - 5}), else: "")}) %>
+ <%= dgettext("ui", "Used in: %{items}%{more}", items: Enum.join(Enum.take(macro.post_slugs, 5), ", "), more: (if length(macro.post_slugs) > 5, do: dgettext("ui", ", +%{count} more", count: length(macro.post_slugs) - 5), else: "")) %>
<% end %>
@@ -1084,7 +1081,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
-
<%= translated("importAnalysis.emptyState") %>
+
<%= dgettext("ui", "Select a WordPress export file to begin analysis.") %>
<% end %>
<% end %>
@@ -1111,10 +1108,10 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
- <%= translated("importAnalysis.slug") %>
- <%= translated("importAnalysis.newEntryWxr") %>
- <%= translated("importAnalysis.existingEntry") %>
- <%= translated("importAnalysis.resolution") %>
+ <%= dgettext("ui", "Slug") %>
+ <%= dgettext("ui", "New Entry (WXR)") %>
+ <%= dgettext("ui", "Existing Entry") %>
+ <%= dgettext("ui", "Resolution") %>
@@ -1122,15 +1119,15 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= Map.get(item, :slug) %>
<%= Map.get(item, :title) %>
- <%= Map.get(item, :existing_title) || translated("importAnalysis.none") %>
+ <%= Map.get(item, :existing_title) || dgettext("ui", "--") %>
@@ -1163,15 +1160,15 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
- <%= translated("importAnalysis.status") %>
+ <%= dgettext("ui", "Status") %>
<%= if @show_type do %>
- <%= translated("importAnalysis.type") %>
+ <%= dgettext("ui", "Type") %>
<% end %>
- <%= translated("importAnalysis.title") %>
- <%= translated("importAnalysis.slug") %>
- <%= translated("importAnalysis.categories") %>
- <%= translated("importAnalysis.wpStatus") %>
- <%= translated("importAnalysis.existingMatch") %>
+ <%= dgettext("ui", "Title") %>
+ <%= dgettext("ui", "Slug") %>
+ <%= dgettext("ui", "Categories") %>
+ <%= dgettext("ui", "WP Status") %>
+ <%= dgettext("ui", "Existing Match") %>
@@ -1184,8 +1181,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= Map.get(item, :title) %>
<%= Map.get(item, :slug) %>
<%= joined_or_none(Map.get(item, :categories)) %>
- <%= Map.get(item, :wp_status) || translated("importAnalysis.none") %>
- <%= Map.get(item, :existing_title) || translated("importAnalysis.none") %>
+ <%= Map.get(item, :wp_status) || dgettext("ui", "--") %>
+ <%= Map.get(item, :existing_title) || dgettext("ui", "--") %>
<% end %>
@@ -1214,11 +1211,11 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
- <%= translated("importAnalysis.status") %>
- <%= translated("importAnalysis.filename") %>
- <%= translated("importAnalysis.type") %>
- <%= translated("importAnalysis.path") %>
- <%= translated("importAnalysis.existingMatch") %>
+ <%= dgettext("ui", "Status") %>
+ <%= dgettext("ui", "Filename") %>
+ <%= dgettext("ui", "Type") %>
+ <%= dgettext("ui", "Path") %>
+ <%= dgettext("ui", "Existing Match") %>
@@ -1226,9 +1223,9 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= item.status %> <%= Map.get(item, :filename) %>
- <%= Map.get(item, :mime_type) || translated("importAnalysis.none") %>
+ <%= Map.get(item, :mime_type) || dgettext("ui", "--") %>
<%= Map.get(item, :relative_path) %>
- <%= Map.get(item, :existing_title) || translated("importAnalysis.none") %>
+ <%= Map.get(item, :existing_title) || dgettext("ui", "--") %>
<% end %>
@@ -1248,10 +1245,10 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= @label %>
<%= total_stats(@stats) %>
- <%= if @stats.new_count > 0 do %><%= @stats.new_count %> <%= translated("importAnalysis.new") %> <% end %>
- <%= if @stats.update_count > 0 do %><%= @stats.update_count %> <%= translated("importAnalysis.update") %> <% end %>
- <%= if @stats.conflict_count > 0 do %><%= @stats.conflict_count %> <%= translated("importAnalysis.conflict") %> <% end %>
- <%= if @stats.duplicate_count > 0 do %><%= @stats.duplicate_count %> <%= translated("importAnalysis.duplicate") %> <% end %>
+ <%= if @stats.new_count > 0 do %><%= @stats.new_count %> <%= dgettext("ui", "new") %> <% end %>
+ <%= if @stats.update_count > 0 do %><%= @stats.update_count %> <%= dgettext("ui", "update") %> <% end %>
+ <%= if @stats.conflict_count > 0 do %><%= @stats.conflict_count %> <%= dgettext("ui", "conflict") %> <% end %>
+ <%= if @stats.duplicate_count > 0 do %><%= @stats.duplicate_count %> <%= dgettext("ui", "duplicate") %> <% end %>
"""
@@ -1285,11 +1282,11 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= @label %>
<%= total_media_stats(@stats) %>
- <%= if @stats.new_count > 0 do %><%= @stats.new_count %> <%= translated("importAnalysis.new") %> <% end %>
- <%= if @stats.update_count > 0 do %><%= @stats.update_count %> <%= translated("importAnalysis.update") %> <% end %>
- <%= if @stats.conflict_count > 0 do %><%= @stats.conflict_count %> <%= translated("importAnalysis.conflict") %> <% end %>
- <%= if @stats.duplicate_count > 0 do %><%= @stats.duplicate_count %> <%= translated("importAnalysis.duplicate") %> <% end %>
- <%= if @stats.missing_count > 0 do %><%= @stats.missing_count %> <%= translated("importAnalysis.missing") %> <% end %>
+ <%= if @stats.new_count > 0 do %><%= @stats.new_count %> <%= dgettext("ui", "new") %> <% end %>
+ <%= if @stats.update_count > 0 do %><%= @stats.update_count %> <%= dgettext("ui", "update") %> <% end %>
+ <%= if @stats.conflict_count > 0 do %><%= @stats.conflict_count %> <%= dgettext("ui", "conflict") %> <% end %>
+ <%= if @stats.duplicate_count > 0 do %><%= @stats.duplicate_count %> <%= dgettext("ui", "duplicate") %> <% end %>
+ <%= if @stats.missing_count > 0 do %><%= @stats.missing_count %> <%= dgettext("ui", "missing") %> <% end %>
"""
@@ -1305,9 +1302,9 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
<%= @label %>
<%= @stats.existing_count + @stats.mapped_count + @stats.new_count %>
- <%= if @stats.existing_count > 0 do %><%= @stats.existing_count %> <%= translated("importAnalysis.existing") %> <% end %>
- <%= if @stats.mapped_count > 0 do %><%= @stats.mapped_count %> <%= translated("importAnalysis.mapped") %> <% end %>
- <%= if @stats.new_count > 0 do %><%= @stats.new_count %> <%= translated("importAnalysis.new") %> <% end %>
+ <%= if @stats.existing_count > 0 do %><%= @stats.existing_count %> <%= dgettext("ui", "existing") %> <% end %>
+ <%= if @stats.mapped_count > 0 do %><%= @stats.mapped_count %> <%= dgettext("ui", "mapped") %> <% end %>
+ <%= if @stats.new_count > 0 do %><%= @stats.new_count %> <%= dgettext("ui", "new") %> <% end %>
"""
@@ -1342,14 +1339,14 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
type="text"
name="mapped_to"
value={Map.get(@edit || %{}, :value, Map.get(item, :mapped_to) || "") || ""}
- placeholder={translated("importAnalysis.mapToPlaceholder")}
+ placeholder={dgettext("ui", "Map to...")}
list={"taxonomy-suggestions-#{@type}"}
autocomplete="off"
/>
- ✓
- ×
+ ✓
+ ×
<%= if present?(item.mapped_to) do %>
- ×
+ ×
<% end %>
<% else %>
@@ -1380,7 +1377,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
phx-value-name={item.name}
phx-value-mapped_to={Map.get(item, :mapped_to) || ""}
><%= item.mapped_to %>
- ×
+ ×
<% end %>
<% end %>
@@ -1416,7 +1413,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
end
defp joined_or_none(values) when is_list(values) and values != [], do: Enum.join(values, ", ")
- defp joined_or_none(_values), do: translated("importAnalysis.none")
+ defp joined_or_none(_values), do: dgettext("ui", "--")
defp status_badge_class(status), do: ["status-badge", status]
@@ -1445,7 +1442,4 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
defp maybe_put(map, _key, nil), do: map
defp maybe_put(map, key, value), do: Map.put(map, key, value)
-
- defp translated(text, bindings \\ %{}),
- do: ShellData.translate(text, bindings, BDS.Desktop.UILocale.current())
end
diff --git a/lib/bds/desktop/shell_live/import_editor/analysis_state.ex b/lib/bds/desktop/shell_live/import_editor/analysis_state.ex
index e6e6574..c357eb8 100644
--- a/lib/bds/desktop/shell_live/import_editor/analysis_state.ex
+++ b/lib/bds/desktop/shell_live/import_editor/analysis_state.ex
@@ -2,7 +2,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
@moduledoc false
alias BDS.{ImportAnalysis, ImportDefinitions, Metadata}
- alias BDS.Desktop.{FilePicker, FolderPicker, ShellData}
+ alias BDS.Desktop.{FilePicker, FolderPicker}
+ use Gettext, backend: BDS.Gettext
@spec change_definition(term(), term(), term()) :: term()
def change_definition(socket, params, reload) do
@@ -18,7 +19,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
@spec select_uploads_folder(term(), term(), term()) :: term()
def select_uploads_folder(socket, reload, append_output) do
with %{id: definition_id} <- socket.assigns.current_tab do
- case FolderPicker.choose_directory(translated("importAnalysis.uploadsFolder")) do
+ case FolderPicker.choose_directory(dgettext("ui", "Uploads Folder")) do
{:ok, uploads_folder_path} ->
{:ok, _definition} =
ImportDefinitions.update_definition(definition_id, %{
@@ -32,7 +33,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
{:error, %{message: message}} ->
socket
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
end
else
@@ -44,7 +45,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
def select_and_analyze(socket, reload, append_output) do
with %{id: definition_id} <- socket.assigns.current_tab,
%{} = definition <- ImportDefinitions.get_definition(definition_id) do
- case FilePicker.choose_file(translated("importAnalysis.wxrFile")) do
+ case FilePicker.choose_file(dgettext("ui", "WXR File")) do
{:ok, wxr_file_path} ->
project_id = socket.assigns.projects.active_project_id
@@ -78,7 +79,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
:import_editor_analysis_states,
Map.put(socket.assigns.import_editor_analysis_states, definition_id, %{
loading: true,
- step: translated("importAnalysis.analyzingWxr"),
+ step: dgettext("ui", "Analyzing WXR file..."),
detail: Path.basename(wxr_file_path),
file_path: wxr_file_path,
ref: task.ref
@@ -99,7 +100,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
{:error, %{message: message}} ->
socket
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
end
else
@@ -167,18 +168,18 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
{:error, reason} ->
socket
- |> append_output.(translated("activity.import"), inspect(reason), nil, "error")
+ |> append_output.(dgettext("ui", "Import"), inspect(reason), nil, "error")
|> reload.(socket.assigns.workbench)
end
{:error, %{message: message}} ->
socket
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
{:error, reason} ->
socket
- |> append_output.(translated("activity.import"), inspect(reason), nil, "error")
+ |> append_output.(dgettext("ui", "Import"), inspect(reason), nil, "error")
|> reload.(socket.assigns.workbench)
end
end
@@ -200,7 +201,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
:import_editor_analysis_states,
Map.delete(socket.assigns.import_editor_analysis_states, definition_id)
)
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
end
end
@@ -294,12 +295,12 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
def translate_phase(step) when is_binary(step) do
case step do
- "parsing" -> translated("importAnalysis.analysisPhase.parsing")
- "scanning" -> translated("importAnalysis.analysisPhase.scanning")
- "taxonomies" -> translated("importAnalysis.analysisPhase.taxonomies")
- "posts" -> translated("importAnalysis.analysisPhase.posts")
- "media" -> translated("importAnalysis.analysisPhase.media")
- "complete" -> translated("importAnalysis.analysisPhase.complete")
+ "parsing" -> dgettext("ui", "Parsing WXR file...")
+ "scanning" -> dgettext("ui", "Scanning entries...")
+ "taxonomies" -> dgettext("ui", "Analyzing taxonomies...")
+ "posts" -> dgettext("ui", "Analyzing posts...")
+ "media" -> dgettext("ui", "Analyzing media...")
+ "complete" -> dgettext("ui", "Analysis complete")
other -> other
end
end
@@ -307,8 +308,5 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
@spec translate_phase(term()) :: term()
def translate_phase(other), do: other
- defp translated(text, bindings \\ %{}),
- do: ShellData.translate(text, bindings, BDS.Desktop.UILocale.current())
-
defp present?(value), do: value not in [nil, ""]
end
diff --git a/lib/bds/desktop/shell_live/import_editor/progress_tracking.ex b/lib/bds/desktop/shell_live/import_editor/progress_tracking.ex
index 6f9d739..fe0afc2 100644
--- a/lib/bds/desktop/shell_live/import_editor/progress_tracking.ex
+++ b/lib/bds/desktop/shell_live/import_editor/progress_tracking.ex
@@ -2,8 +2,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
@moduledoc false
alias BDS.{ImportDefinitions, ImportExecution}
- alias BDS.Desktop.ShellData
alias BDS.Desktop.ShellLive.ImportEditor.AnalysisState
+ use Gettext, backend: BDS.Gettext
@spec execute_import(term(), term(), term()) :: term()
def execute_import(socket, reload, _append_output) do
@@ -129,8 +129,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
})
)
|> append_output.(
- translated("activity.import"),
- translated("importAnalysis.importComplete", %{count: previous_state.count}),
+ dgettext("ui", "Import"),
+ dgettext("ui", "Import completed successfully!", count: previous_state.count),
nil,
"info"
)
@@ -148,7 +148,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
ref: nil
})
)
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
{:error, reason} ->
@@ -165,7 +165,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
ref: nil
})
)
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
end
end
@@ -208,7 +208,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
ref: nil
})
)
- |> append_output.(translated("activity.import"), message, nil, "error")
+ |> append_output.(dgettext("ui", "Import"), message, nil, "error")
|> reload.(socket.assigns.workbench)
end
end
@@ -265,16 +265,16 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
seconds = div(ms, 1000)
if seconds < 60 do
- translated("importAnalysis.eta", %{
- value: translated("importAnalysis.etaSeconds", %{count: seconds})
- })
+ dgettext("ui", "ETA: %{value}",
+ value: dgettext("ui", "%{count}s", count: seconds)
+ )
else
m = div(seconds, 60)
s = rem(seconds, 60)
- translated("importAnalysis.eta", %{
- value: translated("importAnalysis.etaMinutes", %{minutes: m, seconds: s})
- })
+ dgettext("ui", "ETA: %{value}",
+ value: dgettext("ui", "%{minutes}m %{seconds}s", minutes: m, seconds: s)
+ )
end
end
@@ -282,18 +282,15 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.ProgressTracking do
def translate_execution_phase(phase) when is_binary(phase) do
case phase do
- "tags" -> translated("importAnalysis.phase.tags")
- "posts" -> translated("importAnalysis.phase.posts")
- "media" -> translated("importAnalysis.phase.media")
- "pages" -> translated("importAnalysis.phase.pages")
- "complete" -> translated("importAnalysis.phase.complete")
+ "tags" -> dgettext("ui", "Importing tags & categories...")
+ "posts" -> dgettext("ui", "Importing posts...")
+ "media" -> dgettext("ui", "Importing media...")
+ "pages" -> dgettext("ui", "Importing pages...")
+ "complete" -> dgettext("ui", "Import complete")
other -> other
end
end
@spec translate_execution_phase(term()) :: term()
def translate_execution_phase(other), do: other
-
- defp translated(text, bindings \\ %{}),
- do: ShellData.translate(text, bindings, BDS.Desktop.UILocale.current())
end
diff --git a/lib/bds/desktop/shell_live/import_editor/taxonomy_editing.ex b/lib/bds/desktop/shell_live/import_editor/taxonomy_editing.ex
index 9032ca9..6461140 100644
--- a/lib/bds/desktop/shell_live/import_editor/taxonomy_editing.ex
+++ b/lib/bds/desktop/shell_live/import_editor/taxonomy_editing.ex
@@ -2,7 +2,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
@moduledoc false
alias BDS.{AI, ImportDefinitions, Metadata, Tags}
- alias BDS.Desktop.ShellData
+ use Gettext, backend: BDS.Gettext
@spec start_taxonomy_edit(term(), term(), term()) :: term()
def start_taxonomy_edit(
@@ -85,12 +85,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
socket.assigns.offline_mode ->
socket
|> append_output.(
- translated("activity.import"),
- ShellData.translate(
- "Automatic AI actions stay gated by airplane mode.",
- %{},
- socket.assigns.page_language
- ),
+ dgettext("ui", "Import"),
+ BDS.Gettext.lgettext(socket.assigns.page_language, "ui", "Automatic AI actions stay gated by airplane mode."),
nil,
"info"
)
@@ -124,8 +120,8 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
socket
|> append_output.(
- translated("activity.import"),
- translated("importAnalysis.mappedCount", %{count: mapped_count}),
+ dgettext("ui", "Import"),
+ dgettext("ui", "%{count} mapped", count: mapped_count),
Map.get(socket.assigns.import_editor_selected_models, definition_id),
"info"
)
@@ -134,7 +130,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
{:error, reason} ->
socket
|> append_output.(
- translated("activity.import"),
+ dgettext("ui", "Import"),
inspect(reason),
Map.get(socket.assigns.import_editor_selected_models, definition_id),
"error"
@@ -274,19 +270,16 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
def taxonomy_mapping_tooltip(item) do
action =
if present?(item.mapped_to),
- do: translated("importAnalysis.mappingActionEdit"),
- else: translated("importAnalysis.mappingActionAdd")
+ do: dgettext("ui", "edit"),
+ else: dgettext("ui", "add")
- translated("importAnalysis.mappingTooltip", %{action: action})
+ dgettext("ui", "Click to %{action} mapping", action: action)
end
@spec maybe_put_option(term(), term(), term()) :: term()
def maybe_put_option(opts, _key, nil), do: opts
def maybe_put_option(opts, key, value), do: Keyword.put(opts, key, value)
- defp translated(text, bindings \\ %{}),
- do: ShellData.translate(text, bindings, BDS.Desktop.UILocale.current())
-
defp present?(value), do: value not in [nil, ""]
defp blank_to_nil(""), do: nil
defp blank_to_nil(value), do: value
diff --git a/lib/bds/desktop/shell_live/index.html.heex b/lib/bds/desktop/shell_live/index.html.heex
index 57a9adb..4ae23a1 100644
--- a/lib/bds/desktop/shell_live/index.html.heex
+++ b/lib/bds/desktop/shell_live/index.html.heex
@@ -77,8 +77,8 @@
data-testid="toggle-sidebar"
type="button"
phx-click="toggle_sidebar"
- aria-label={translated("Toggle sidebar")}
- title={translated("Toggle sidebar")}
+ aria-label={dgettext("ui", "Toggle sidebar")}
+ title={dgettext("ui", "Toggle sidebar")}
>