Skip to content

Commit

Permalink
Rename a duplicate interface to org.opensuse.Agama1.LocaleMixin
Browse files Browse the repository at this point in the history
it has only a SetLocale method, used as a mixin, to localize the output of
various components,
but it collided with org.opensuse.Agama1.Locale which is the main locale
config for the system
  • Loading branch information
mvidner committed Nov 13, 2024
1 parent a3cf8ab commit c1f640e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion rust/agama-lib/src/proxies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ mod issues;
pub use issues::IssuesProxy;

mod locale;
pub use locale::LocaleProxy;
pub use locale::LocaleMixinProxy;

pub mod jobs;
6 changes: 3 additions & 3 deletions rust/agama-lib/src/proxies/locale.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! # D-Bus interface proxy for: `org.opensuse.Agama1.Locale`
//! # D-Bus interface proxy for: `org.opensuse.Agama1.LocaleMixin`
//!
//! This code was generated by `zbus-xmlgen` `5.0.0` from D-Bus introspection data.
//! Source: `org.opensuse.Agama1.Manager.bus.xml`.
Expand All @@ -22,10 +22,10 @@ use zbus::proxy;
#[proxy(
default_service = "org.opensuse.Agama.Manager1",
default_path = "/org/opensuse/Agama/Manager1",
interface = "org.opensuse.Agama1.Locale",
interface = "org.opensuse.Agama1.LocaleMixin",
assume_defaults = true
)]
pub trait Locale {
pub trait LocaleMixin {
/// SetLocale method
fn set_locale(&self, locale: &str) -> zbus::Result<()>;
}
2 changes: 1 addition & 1 deletion rust/agama-server/src/l10n/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use crate::{
};
use agama_lib::{
error::ServiceError, localization::model::LocaleConfig, localization::LocaleProxy,
proxies::LocaleProxy as ManagerLocaleProxy,
proxies::LocaleMixinProxy as ManagerLocaleProxy,
};
use agama_locale_data::LocaleId;
use axum::{
Expand Down
2 changes: 1 addition & 1 deletion service/lib/agama/dbus/interfaces/locale.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module Locale
include Yast::I18n
include Yast::Logger

LOCALE_INTERFACE = "org.opensuse.Agama1.Locale"
LOCALE_INTERFACE = "org.opensuse.Agama1.LocaleMixin"

def self.included(base)
base.class_eval do
Expand Down

0 comments on commit c1f640e

Please sign in to comment.