Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

Merge branch 'feat/gpui-i18n-language-picker' into feat/gpui-i18n-main-surfaces

Richie McIlroycff0b6bac395
diff --cc apps/desktop-gpui/src/controls_window.rs
index 3bf0f4eb1,392984e0a..4aca069a6
--- a/apps/desktop-gpui/src/controls_window.rs
+++ b/apps/desktop-gpui/src/controls_window.rs
@@@ -10,15 -10,14 +10,15 @@@
use std::time::Duration;
use gpui::{
- Context, Entity, FontWeight, InteractiveElement as _, IntoElement, MouseButton,
- ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, Styled, Window, div,
- prelude::FluentBuilder as _, px, svg,
+ AppContext as _, Context, Entity, FontWeight, InteractiveElement as _, IntoElement,
+ MouseButton, ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, Styled,
+ Window, div, prelude::FluentBuilder as _, px, svg,
};
+use crate::i18n::tr;
use crate::theme::LocaleFont as _;
use crate::{
- feeds::{self, Feeds},
+ feeds::Feeds,
recording::RecordingMode,
session::{Phase, RecordingSession},
theme::Theme,
@@@ -582,22 -559,16 +567,17 @@@ fn recording_issue_text(error: String)
.max_h(px(56.))
.overflow_x_scroll()
.overflow_y_scroll()
- .child(if error.contains("Insufficient disk space")
- && error.contains("Your recording is still paused")
- {
- "Not enough disk space to resume. Free up space and try again, or press Stop to save."
- .to_owned()
- } else {
- error
- })
+ .child(
+ if error.contains("Insufficient disk space")
+ && error.contains("Your recording is still paused")
+ {
+ tr::controls::disk_full_resume().to_owned()
+ } else {
+ error
+ },
+ )
}
- /// The bar's track is 20pt wide.
- fn level_bar_px(db: f64, scale: f32) -> u32 {
- (feeds::bar_level(db) * 20.0 * f64::from(scale)).round() as u32
- }
-
fn tick_delay(live: bool, elapsed: Duration) -> Duration {
if live {
until_next_second(elapsed)
diff --cc apps/desktop-gpui/src/main_window.rs
index a4ce3ad19,52aa06f8d..381226e6a
--- a/apps/desktop-gpui/src/main_window.rs
+++ b/apps/desktop-gpui/src/main_window.rs
@@@ -5243,12 -5192,11 +5279,10 @@@ impl MainWindow
DeviceFormat::Microphone(settings).label()
})
} else {
- mic.describe()
- .map(|description| format!("Available: {description}"))
+ mic.describe().map(tr::main::device::format::available)
},
selected,
- selected.then(|| {
- feeds::picker_level(Feeds::global(cx).read(cx).mic_level_db)
- }),
+ selected.then(|| self.device_microphone_level.clone()),
cx.listener(move |this, _, _window, cx| {
if !this.device_changes_allowed(cx) {
return;