From 88dbd866e0d7d16e687b1984d092716825e8a148 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 21 Dec 2018 14:46:10 -0800 Subject: [PATCH] elementary: rename Efl.Ui.Translatable -> Efl.Ui.L10n If we are to choose Efl.Ui.I18n for the internationalization support, the localization API should be named accordingly L10n. Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D7507 --- src/Makefile_Elementary.am | 2 +- src/lib/elementary/Efl_Ui.h | 2 +- src/lib/elementary/Elementary.h | 2 +- src/lib/elementary/efl_ui_button.eo | 2 +- src/lib/elementary/efl_ui_clock.c | 6 +++--- src/lib/elementary/efl_ui_clock.eo | 2 +- src/lib/elementary/efl_ui_frame.eo | 2 +- src/lib/elementary/efl_ui_grid_default_item.eo | 4 ++-- .../{efl_ui_translatable.eo => efl_ui_l10n.eo} | 4 ++-- src/lib/elementary/efl_ui_layout.c | 8 ++++---- src/lib/elementary/efl_ui_layout_part_legacy.eo | 4 ++-- src/lib/elementary/efl_ui_layout_part_text.eo | 4 ++-- src/lib/elementary/efl_ui_list_default_item.eo | 2 +- src/lib/elementary/efl_ui_navigation_bar.eo | 2 +- src/lib/elementary/efl_ui_progressbar.eo | 2 +- src/lib/elementary/efl_ui_widget.c | 10 +++++----- src/lib/elementary/efl_ui_widget.eo | 4 ++-- src/lib/elementary/efl_ui_win.c | 4 ++-- src/lib/elementary/elc_combobox.c | 12 ++++++------ src/lib/elementary/elc_ctxpopup.c | 6 +++--- src/lib/elementary/elc_hoversel.c | 6 +++--- src/lib/elementary/elc_multibuttonentry.c | 6 +++--- src/lib/elementary/elc_naviframe.c | 6 +++--- src/lib/elementary/elc_popup.c | 8 ++++---- src/lib/elementary/elm_combobox.eo | 2 +- src/lib/elementary/elm_ctxpopup.eo | 2 +- src/lib/elementary/elm_dayselector.c | 6 +++--- src/lib/elementary/elm_dayselector.eo | 2 +- src/lib/elementary/elm_diskselector.c | 4 ++-- src/lib/elementary/elm_diskselector.eo | 2 +- src/lib/elementary/elm_hoversel.eo | 2 +- src/lib/elementary/elm_list.c | 6 +++--- src/lib/elementary/elm_list.eo | 2 +- src/lib/elementary/elm_main.c | 8 ++++---- src/lib/elementary/elm_menu.c | 4 ++-- src/lib/elementary/elm_menu.eo | 2 +- src/lib/elementary/elm_multibuttonentry.eo | 2 +- src/lib/elementary/elm_naviframe.eo | 2 +- src/lib/elementary/elm_notify.c | 4 ++-- src/lib/elementary/elm_notify_part.eo | 4 ++-- src/lib/elementary/elm_part_helper.h | 8 ++++---- src/lib/elementary/elm_popup.eo | 2 +- src/lib/elementary/elm_segment_control.c | 6 +++--- src/lib/elementary/elm_segment_control.eo | 2 +- src/lib/elementary/elm_slider.eo | 2 +- src/lib/elementary/elm_toolbar.c | 6 +++--- src/lib/elementary/elm_toolbar.eo | 2 +- src/lib/elementary/meson.build | 2 +- 48 files changed, 97 insertions(+), 97 deletions(-) rename src/lib/elementary/{efl_ui_translatable.eo => efl_ui_l10n.eo} (96%) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 57a5af2a17..648a521b3c 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -57,7 +57,7 @@ elm_public_eolian_files = \ lib/elementary/efl_ui_text_factory_fallback.eo \ lib/elementary/efl_ui_textpath.eo \ lib/elementary/efl_ui_textpath_legacy.eo \ - lib/elementary/efl_ui_translatable.eo \ + lib/elementary/efl_ui_l10n.eo \ lib/elementary/efl_ui_clock.eo \ lib/elementary/efl_ui_cursor.eo \ lib/elementary/efl_ui_image_factory.eo \ diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index cba63e2f79..f4219975b8 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -158,7 +158,7 @@ typedef Eo Efl_Ui_Focus_Manager; # include # include # include -# include +# include # include # include # include diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index 936e078d28..9ae22e8d54 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -160,7 +160,7 @@ typedef Eo Efl_Ui_Focus_Manager; # include # include # include -# include +# include # include # include # include diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo index ff072a9547..f8cff542b2 100644 --- a/src/lib/elementary/efl_ui_button.eo +++ b/src/lib/elementary/efl_ui_button.eo @@ -21,6 +21,6 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Content.content { get; set; } Efl.Content.content_unset; Efl.Text.text { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } } } diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 5f1d16c2cd..528e1f4727 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_OBJECT_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #include #include "elm_priv.h" @@ -439,12 +439,12 @@ _reload_format(Evas_Object *obj) } EOLIAN static void -_efl_ui_clock_efl_ui_translatable_translation_update(Eo *obj, Efl_Ui_Clock_Data *sd) +_efl_ui_clock_efl_ui_l10n_translation_update(Eo *obj, Efl_Ui_Clock_Data *sd) { if (!sd->user_format) _reload_format(obj); else _field_list_display(obj); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo index f882ba0d3f..69e5f61a16 100644 --- a/src/lib/elementary/efl_ui_clock.eo +++ b/src/lib/elementary/efl_ui_clock.eo @@ -226,7 +226,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout) Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.on_disabled_update; Efl.Ui.Focus.Object.on_focus_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; } events { changed: void; [[Called when clock changed]] diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo index 30d7d3646b..62dbf6de25 100644 --- a/src/lib/elementary/efl_ui_frame.eo +++ b/src/lib/elementary/efl_ui_frame.eo @@ -58,7 +58,7 @@ class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup, Efl.Canvas.Group.group_calculate; Efl.Text.text { get; set; } Efl.Text_Markup.markup { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } Efl.Content.content { get; set; } Efl.Content.content_unset; } diff --git a/src/lib/elementary/efl_ui_grid_default_item.eo b/src/lib/elementary/efl_ui_grid_default_item.eo index 425ed14582..729234e2cd 100644 --- a/src/lib/elementary/efl_ui_grid_default_item.eo +++ b/src/lib/elementary/efl_ui_grid_default_item.eo @@ -2,7 +2,7 @@ class Efl.Ui.Grid_Default_Item (Efl.Ui.Grid_Item, Efl.Text, Efl.Text_Markup, - Efl.Ui.Translatable, + Efl.Ui.L10n, Efl.Content) { [[Grid Default Item class. @@ -20,7 +20,7 @@ class Efl.Ui.Grid_Default_Item (Efl.Ui.Grid_Item, Efl.Object.destructor; Efl.Text.text { get; set; } Efl.Text_Markup.markup { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } Efl.Content.content { get; set; } Efl.Content.content_unset; Efl.Part.part_get; diff --git a/src/lib/elementary/efl_ui_translatable.eo b/src/lib/elementary/efl_ui_l10n.eo similarity index 96% rename from src/lib/elementary/efl_ui_translatable.eo rename to src/lib/elementary/efl_ui_l10n.eo index 08ea72139c..5275759262 100644 --- a/src/lib/elementary/efl_ui_translatable.eo +++ b/src/lib/elementary/efl_ui_l10n.eo @@ -1,4 +1,4 @@ -interface Efl.Ui.Translatable +interface Efl.Ui.L10n { [[Interface for all translatable text APIs. @@ -6,7 +6,7 @@ interface Efl.Ui.Translatable but may also be used in text-to-speech situations. ]] methods { - @property translatable_text { + @property l10n_text { [[A unique string to be translated. Often this will be a human-readable string (e.g. in English) but it diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index deba292ce5..b3aaa083e9 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -2534,14 +2534,14 @@ TEXT_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_D MARKUP_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) EOLIAN static const char * -_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) +_efl_ui_layout_part_text_efl_ui_l10n_l10n_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); return elm_widget_part_translatable_text_get(pd->obj, pd->part, domain); } EOLIAN static void -_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain) +_efl_ui_layout_part_text_efl_ui_l10n_l10n_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain); @@ -2553,14 +2553,14 @@ TEXT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout MARKUP_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) EOLIAN static const char * -_efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) +_efl_ui_layout_part_legacy_efl_ui_l10n_l10n_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); return elm_widget_part_translatable_text_get(pd->obj, pd->part, domain); } EOLIAN static void -_efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain) +_efl_ui_layout_part_legacy_efl_ui_l10n_l10n_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain); diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo b/src/lib/elementary/efl_ui_layout_part_legacy.eo index 5bb80040ca..1ebd8ae3be 100644 --- a/src/lib/elementary/efl_ui_layout_part_legacy.eo +++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo @@ -1,5 +1,5 @@ class Efl.Ui.Layout_Part_Legacy (Efl.Ui.Layout_Part, Efl.Content, Efl.Text, - Efl.Text_Markup, Efl.Ui.Translatable) + Efl.Text_Markup, Efl.Ui.L10n) { [[Elementary layout internal part class]] data: null; @@ -8,6 +8,6 @@ class Efl.Ui.Layout_Part_Legacy (Efl.Ui.Layout_Part, Efl.Content, Efl.Text, Efl.Content.content_unset; Efl.Text.text { set; get; } Efl.Text_Markup.markup { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } } } diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo b/src/lib/elementary/efl_ui_layout_part_text.eo index abe9fcef47..166df84676 100644 --- a/src/lib/elementary/efl_ui_layout_part_text.eo +++ b/src/lib/elementary/efl_ui_layout_part_text.eo @@ -1,11 +1,11 @@ class Efl.Ui.Layout_Part_Text (Efl.Ui.Layout_Part, Efl.Text, Efl.Text_Markup, - Efl.Ui.Translatable) + Efl.Ui.L10n) { [[Elementary layout internal part class]] data: null; implements { Efl.Text.text { set; get; } Efl.Text_Markup.markup { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } } } diff --git a/src/lib/elementary/efl_ui_list_default_item.eo b/src/lib/elementary/efl_ui_list_default_item.eo index 34a86f7642..8e5948ad80 100644 --- a/src/lib/elementary/efl_ui_list_default_item.eo +++ b/src/lib/elementary/efl_ui_list_default_item.eo @@ -15,7 +15,7 @@ class Efl.Ui.List_Default_Item (Efl.Ui.List_Item, Efl.Object.destructor; Efl.Text.text { get; set; } Efl.Text_Markup.markup { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } Efl.Content.content { get; set; } Efl.Content.content_unset; Efl.Part.part_get; diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo index a5dd95c7f0..1a40249e18 100644 --- a/src/lib/elementary/efl_ui_navigation_bar.eo +++ b/src/lib/elementary/efl_ui_navigation_bar.eo @@ -24,7 +24,7 @@ class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text) Efl.Content.content { set; get; } Efl.Content.content_unset; Efl.Text.text { set; get; } - Efl.Ui.Translatable.translatable_text { set; get; } + Efl.Ui.L10n.l10n_text { set; get; } Efl.Part.part_get; } } diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index 44bdd98767..80e7caf33c 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -61,7 +61,7 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format, Efl.Text_Markup.markup { get; set; } Efl.Content.content { get; set; } Efl.Content.content_unset; - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } } events { changed: void; [[Called when progressbar changed]] diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 431e66b437..eec2bde180 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -8,7 +8,7 @@ #define ELM_WIDGET_ITEM_PROTECTED #define EFL_CANVAS_OBJECT_BETA #define EFL_INPUT_EVENT_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED #define EFL_UI_WIDGET_PART_BG_PROTECTED #define EFL_PART_PROTECTED @@ -2978,7 +2978,7 @@ elm_widget_part_translatable_text_get(const Eo *obj, const char *part, const cha } EOLIAN static void -_efl_ui_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { const Eina_List *l; Evas_Object *child; @@ -2986,10 +2986,10 @@ _efl_ui_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_W EINA_LIST_FOREACH(sd->subobjs, l, child) { if (elm_widget_is(child)) - efl_ui_translatable_translation_update(child); + efl_ui_l10n_translation_update(child); } - if (sd->hover_obj) efl_ui_translatable_translation_update(sd->hover_obj); + if (sd->hover_obj) efl_ui_l10n_translation_update(sd->hover_obj); #ifdef HAVE_GETTEXT Elm_Translate_String_Data *ts; @@ -6158,4 +6158,4 @@ ELM_PART_TEXT_DEFAULT_GET(efl_ui_widget, NULL) #include "efl_ui_widget.eo.c" /* Others */ -#include "efl_ui_translatable.eo.c" +#include "efl_ui_l10n.eo.c" diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index ca6fca818c..08fdcde4e9 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -15,7 +15,7 @@ struct Efl.Ui.Widget_Focus_State { abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object, Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object, - Efl.Ui.Cursor, Efl.Ui.Translatable, + Efl.Ui.Cursor, Efl.Ui.L10n, Efl.Ui.Selection, Efl.Ui.Dnd) { [[Efl UI widget abstract class]] @@ -589,7 +589,7 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object, Efl.Ui.Cursor.cursor_style { get; set; } Efl.Ui.Cursor.cursor_theme_search_enabled { get; set; } Efl.Ui.Focus.Object.on_focus_update; - Efl.Ui.Translatable.translation_update; [[This implements the calls to $gettext() and $text_set().]] + Efl.Ui.L10n.translation_update; [[This implements the calls to $gettext() and $text_set().]] Efl.Part.part_get; [[Returns @Efl.Ui.Widget_Part.]] } events { diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 0eca88120a..02ac728dd2 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -9,7 +9,7 @@ #define EFL_GFX_SIZE_HINT_PROTECTED #define EFL_CANVAS_OBJECT_BETA #define EFL_CANVAS_OBJECT_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_UI_WIN_INLINED_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED #define EFL_UI_WIN_BETA @@ -3726,7 +3726,7 @@ _elm_win_translate(void) Evas_Object *obj; EINA_LIST_FOREACH(_elm_win_list, l, obj) - efl_ui_translatable_translation_update(obj); + efl_ui_l10n_translation_update(obj); } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index b9ca27a43d..5256764b0f 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -5,7 +5,7 @@ #define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #include #include "elm_priv.h" @@ -50,14 +50,14 @@ static const Elm_Action key_actions[] = { }; EOLIAN static void -_elm_combobox_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd) +_elm_combobox_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd) { - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); - efl_ui_translatable_translation_update(sd->genlist); - efl_ui_translatable_translation_update(sd->entry); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(sd->genlist); + efl_ui_l10n_translation_update(sd->entry); if (sd->hover) - efl_ui_translatable_translation_update(sd->hover); + efl_ui_l10n_translation_update(sd->hover); } EOLIAN static Efl_Ui_Theme_Apply_Result diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index a389c0df43..fd8a4337e5 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -7,7 +7,7 @@ #define EFL_UI_WIDGET_PROTECTED //#define EFL_UI_WIDGET_BETA #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_PART_PROTECTED #include @@ -50,7 +50,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static void -_elm_ctxpopup_efl_ui_translatable_translation_update(Eo *obj, Elm_Ctxpopup_Data *sd) +_elm_ctxpopup_efl_ui_l10n_translation_update(Eo *obj, Elm_Ctxpopup_Data *sd) { Eina_List *l; Elm_Object_Item *it; @@ -60,7 +60,7 @@ _elm_ctxpopup_efl_ui_translatable_translation_update(Eo *obj, Elm_Ctxpopup_Data EINA_LIST_FOREACH(sd->items, l, it) elm_wdg_item_translate(it); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } static Eina_Bool diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 4ec42b05ad..f70cc1017b 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #include #include "elm_priv.h" @@ -52,7 +52,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static void -_elm_hoversel_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) +_elm_hoversel_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { Eo *it; Eina_List *l; @@ -60,7 +60,7 @@ _elm_hoversel_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Ho EINA_LIST_FOREACH(sd->items, l, it) elm_wdg_item_translate(it); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } EOLIAN static Efl_Ui_Theme_Apply_Result diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index d20f477d38..01e2cebc3b 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -6,7 +6,7 @@ #define ELM_WIDGET_ITEM_PROTECTED //#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_PART_PROTECTED #include @@ -71,7 +71,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, ); EOLIAN static void -_elm_multibuttonentry_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) +_elm_multibuttonentry_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { Elm_Object_Item *it; Eina_List *l; @@ -79,7 +79,7 @@ _elm_multibuttonentry_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED EINA_LIST_FOREACH(sd->items, l, it) elm_wdg_item_translate(it); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } static char * diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 19ef33b107..7e757a44c2 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define ELM_WIDGET_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_PART_PROTECTED #include @@ -97,14 +97,14 @@ _prev_page_focus_recover(Elm_Naviframe_Item_Data *it) } EOLIAN static void -_elm_naviframe_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) +_elm_naviframe_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item_Data *it; EINA_INLIST_FOREACH(sd->stack, it) elm_wdg_item_translate(EO_OBJ(it)); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } static void diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 877fc64f5b..8c4684e0b3 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_PART_PROTECTED #include @@ -65,7 +65,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(_notify_cb, static void _on_content_del(void *data, Evas *e, Evas_Object *obj, void *event_info); EOLIAN static void -_elm_popup_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) +_elm_popup_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) { Elm_Popup_Item_Data *it; Eina_List *l; @@ -73,8 +73,8 @@ _elm_popup_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Popup EINA_LIST_FOREACH(sd->items, l, it) elm_wdg_item_translate(EO_OBJ(it)); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); - efl_ui_translatable_translation_update(sd->main_layout); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(sd->main_layout); } static void diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index 62d447024d..390ab08d59 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -40,7 +40,7 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Gfx.Entity.visible { set; } Efl.Gfx.Entity.size { set; } Efl.Ui.Widget.theme_apply; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } Elm.Genlist.filter { set; } diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 7199aa7f04..35956c68f2 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -234,7 +234,7 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Widget.widget_parent { set; } Efl.Ui.Widget.on_disabled_update; Efl.Ui.Widget.widget_sub_object_add; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.widget_event; Efl.Ui.Widget.focused_item { get; } diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 5865a40948..eb051c0c52 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_OBJECT_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_PART_PROTECTED #include @@ -58,7 +58,7 @@ _dayselector_resize(void *data, } EOLIAN static void -_elm_dayselector_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Dayselector_Data *sd) +_elm_dayselector_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Dayselector_Data *sd) { time_t t; Eina_List *l; @@ -78,7 +78,7 @@ _elm_dayselector_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm elm_object_text_set(VIEW(it), buf); } - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } static void diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo index 56b35044fb..f21d746087 100644 --- a/src/lib/elementary/elm_dayselector.eo +++ b/src/lib/elementary/elm_dayselector.eo @@ -152,7 +152,7 @@ class Elm.Dayselector (Efl.Ui.Layout, Efl.Ui.Legacy) class.constructor; Efl.Object.constructor; Efl.Ui.Widget.theme_apply; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Part.part_get; } events { diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index a7034f1438..6994f8d2a8 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -5,7 +5,7 @@ #define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #include #include "elm_priv.h" @@ -50,7 +50,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static void -_elm_diskselector_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *sd) +_elm_diskselector_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *sd) { Elm_Diskselector_Item_Data *it; Eina_List *l; diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index ac0d5fbbee..d69ef7733f 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -204,7 +204,7 @@ class Elm.Diskselector (Efl.Ui.Widget, Elm.Interface_Scrollable, Efl.Ui.Widget.on_access_update; Efl.Ui.Widget.theme_apply; Efl.Ui.Focus.Object.on_focus_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_sub_object_del; Efl.Ui.Widget.widget_event; Elm.Interface_Scrollable.policy { get; set; } diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index 863482f9c9..807b2a3810 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -98,7 +98,7 @@ class Elm.Hoversel (Efl.Ui.Button_Legacy, Efl.Ui.Selectable, Efl.Gfx.Entity.visible { set; } Efl.Ui.Widget.widget_parent { set; } Efl.Ui.Widget.theme_apply; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } Efl.Access.Widget.Action.elm_actions { get; } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 935ef198f3..7310201c27 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #include @@ -678,7 +678,7 @@ static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params EINA_UN } EOLIAN static void -_elm_list_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_List_Data *sd) +_elm_list_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_List_Data *sd) { Elm_Object_Item *it; Eina_List *l; @@ -686,7 +686,7 @@ _elm_list_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_List_D EINA_LIST_FOREACH(sd->items, l, it) elm_wdg_item_translate(it); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index 2311471a74..373a3b7954 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -402,7 +402,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Widget.focus_highlight_geometry { get; } Efl.Ui.Widget.on_disabled_update; Efl.Ui.Focus.Object.on_focus_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_sub_object_del; Efl.Ui.Widget.widget_event; Efl.Ui.Widget.focused_item { get; } diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 6fcfc39678..b4c83e3105 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1485,9 +1485,9 @@ elm_object_domain_translatable_part_text_set(Evas_Object *obj, const char *part, else { if (!part) - efl_ui_translatable_text_set(obj, text, domain); + efl_ui_l10n_text_set(obj, text, domain); else - efl_ui_translatable_text_set(efl_part(obj, part), text, domain); + efl_ui_l10n_text_set(efl_part(obj, part), text, domain); } } @@ -1507,9 +1507,9 @@ elm_object_translatable_part_text_get(const Evas_Object *obj, const char *part) else { if (!part) - return efl_ui_translatable_text_get(obj, NULL); + return efl_ui_l10n_text_get(obj, NULL); else - return efl_ui_translatable_text_get(efl_part(obj, part), NULL); + return efl_ui_l10n_text_get(efl_part(obj, part), NULL); } } diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 9ea96ddf4e..53cc85f2c9 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED #include @@ -34,7 +34,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { #undef ELM_PRIV_MENU_SIGNALS EOLIAN static void -_elm_menu_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) +_elm_menu_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) { Elm_Menu_Item_Data *it; Eina_List *l; diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo index d67f87a81b..f197d5e248 100644 --- a/src/lib/elementary/elm_menu.eo +++ b/src/lib/elementary/elm_menu.eo @@ -90,7 +90,7 @@ class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Gfx.Entity.visible { set; } Efl.Ui.Widget.widget_parent { get; set; } Efl.Ui.Widget.theme_apply; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget_Focus_Manager.focus_manager_create; Efl.Access.Object.access_children { get; } Efl.Access.Selection.selected_children_count { get; } diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index b78b8d6bf0..70d5547e02 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -180,7 +180,7 @@ class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy) Efl.Object.constructor; Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.on_access_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_event; Efl.Access.Object.access_children { get; } Efl.Part.part_get; diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index 039cb0320b..f225295e6a 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -145,7 +145,7 @@ class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Object.constructor; Efl.Gfx.Entity.visible { set; } Efl.Ui.Widget.on_access_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.widget_event; Efl.Layout.Signal.signal_emit; diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 8a123d2de9..c8902647c8 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -710,14 +710,14 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data) ELM_PART_CONTENT_DEFAULT_GET(elm_notify, "default") EOLIAN static const char * -_elm_notify_part_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) +_elm_notify_part_efl_ui_l10n_l10n_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); return elm_widget_part_translatable_text_get(pd->obj, pd->part, domain); } EOLIAN static void -_elm_notify_part_efl_ui_translatable_translatable_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain) +_elm_notify_part_efl_ui_l10n_l10n_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain); diff --git a/src/lib/elementary/elm_notify_part.eo b/src/lib/elementary/elm_notify_part.eo index 9f66b84bbe..9ce356d19e 100644 --- a/src/lib/elementary/elm_notify_part.eo +++ b/src/lib/elementary/elm_notify_part.eo @@ -1,11 +1,11 @@ class Elm.Notify.Part (Efl.Ui.Widget_Part, Efl.Content, Efl.Text, - Efl.Ui.Translatable) + Efl.Ui.L10n) { [[Elementary notification internel part class]] data: null; implements { Efl.Text.text { get; set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } Efl.Content.content { get; set; } Efl.Content.content_unset; } diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h index 6fe2304d8f..8f83f98c6f 100644 --- a/src/lib/elementary/elm_part_helper.h +++ b/src/lib/elementary/elm_part_helper.h @@ -207,14 +207,14 @@ _ ## type ## _efl_text_text_get(const Eo *obj, typedata *sd EINA_UNUSED) \ return efl_text_get(efl_part(obj, efl_ui_widget_default_text_part_get(obj))); \ } \ EOLIAN static void \ -_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, typedata *sd EINA_UNUSED, const char *label, const char *domain) \ +_ ## type ## _efl_ui_l10n_l10n_text_set(Eo *obj, typedata *sd EINA_UNUSED, const char *label, const char *domain) \ { \ - efl_ui_translatable_text_set(efl_part(obj, efl_ui_widget_default_text_part_get(obj)), label, domain); \ + efl_ui_l10n_text_set(efl_part(obj, efl_ui_widget_default_text_part_get(obj)), label, domain); \ } \ EOLIAN static const char * \ -_ ## type ## _efl_ui_translatable_translatable_text_get(const Eo *obj, typedata *sd EINA_UNUSED, const char **domain) \ +_ ## type ## _efl_ui_l10n_l10n_text_get(const Eo *obj, typedata *sd EINA_UNUSED, const char **domain) \ { \ - return efl_ui_translatable_text_get(efl_part(obj, efl_ui_widget_default_text_part_get(obj)), domain); \ + return efl_ui_l10n_text_get(efl_part(obj, efl_ui_widget_default_text_part_get(obj)), domain); \ } #define ELM_PART_MARKUP_DEFAULT_IMPLEMENT(type, typedata) \ diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index e0988f73a2..4469f9c5b3 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -171,7 +171,7 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.on_access_update; Efl.Ui.Widget.widget_parent { set; } - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_sub_object_del; Efl.Ui.Widget.widget_event; Efl.Layout.Signal.signal_emit; diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index e46e3802d9..3bcc7207d9 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_OBJECT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include @@ -28,7 +28,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { }; EOLIAN static void -_elm_segment_control_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Segment_Control_Data *sd) +_elm_segment_control_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Segment_Control_Data *sd) { Elm_Object_Item *it; Eina_List *l; @@ -36,7 +36,7 @@ _elm_segment_control_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, EINA_LIST_FOREACH(sd->items, l, it) elm_wdg_item_translate(it); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo index 76db9363cb..27b83ac47e 100644 --- a/src/lib/elementary/elm_segment_control.eo +++ b/src/lib/elementary/elm_segment_control.eo @@ -139,7 +139,7 @@ class Elm.Segment_Control (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legac Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.on_access_update; Efl.Ui.Widget.on_disabled_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; } events { changed: Efl.Object; [[Called when segment control changed]] diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo index 8a786d4dab..a19ad208ec 100644 --- a/src/lib/elementary/elm_slider.eo +++ b/src/lib/elementary/elm_slider.eo @@ -19,7 +19,7 @@ class Elm.Slider (Efl.Ui.Slider_Interval, Efl.Ui.Legacy, Efl.Text.text { get; set; } Efl.Text_Markup.markup { get; set; } Efl.Ui.Format.format_cb { set; } - Efl.Ui.Translatable.translatable_text { get; set; } + Efl.Ui.L10n.l10n_text { get; set; } Efl.Part.part_get; } } diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 0a5a56d7fc..8d6caf9c6c 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -7,7 +7,7 @@ #define EFL_ACCESS_SELECTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_L10N_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED #include @@ -1682,14 +1682,14 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El } EOLIAN static void -_elm_toolbar_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) +_elm_toolbar_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) { Elm_Toolbar_Item_Data *it; EINA_INLIST_FOREACH(sd->items, it) elm_wdg_item_translate(EO_OBJ(it)); - efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); + efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } static void diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index 4bc7d1661d..1c70d47dc8 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -353,7 +353,7 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Ui.Widget.on_access_update; Efl.Ui.Widget.theme_apply; Efl.Ui.Focus.Object.on_focus_update; - Efl.Ui.Translatable.translation_update; + Efl.Ui.L10n.translation_update; Efl.Ui.Widget.widget_event; Efl.Ui.Widget.focus_highlight_geometry { get; } Efl.Ui.Widget.focused_item { get; } diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 8b464ce78d..ca6d1a4c3a 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -184,7 +184,7 @@ pub_eo_files = [ 'efl_ui_text_factory_emoticons.eo', 'efl_ui_text_factory_fallback.eo', 'efl_ui_textpath.eo', - 'efl_ui_translatable.eo', + 'efl_ui_l10n.eo', 'efl_ui_clock.eo', 'efl_ui_cursor.eo', 'efl_ui_image_factory.eo',