Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
intl/gettext: handle .ic_class and .name from idnode classes
  • Loading branch information
@perexg
perexg committed Jun 17, 2015
1 parent ef6cdbf commit 44b6d2d
Show file tree
Hide file tree
Showing 47 changed files with 10,815 additions and 1,176 deletions.
2,612 changes: 2,514 additions & 98 deletions intl/tvheadend.cs.po
View file

Large diffs are not rendered by default.

2,593 changes: 2,499 additions & 94 deletions intl/tvheadend.de.po
View file

Large diffs are not rendered by default.

2,593 changes: 2,499 additions & 94 deletions intl/tvheadend.pl.po
View file

Large diffs are not rendered by default.

2,593 changes: 2,499 additions & 94 deletions intl/tvheadend.pot
View file

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions src/access.c
View file
Expand Up @@ -1242,16 +1242,16 @@ access_entry_conn_limit_type_enum ( void *p )
{
static struct strtab
conn_limit_type_tab[] = {
{ "All (Streaming + DVR)", ACCESS_CONN_LIMIT_TYPE_ALL },
{ "Streaming", ACCESS_CONN_LIMIT_TYPE_STREAMING },
{ "DVR", ACCESS_CONN_LIMIT_TYPE_DVR },
{ N_("All (Streaming + DVR)"), ACCESS_CONN_LIMIT_TYPE_ALL },
{ N_("Streaming"), ACCESS_CONN_LIMIT_TYPE_STREAMING },
{ N_("DVR"), ACCESS_CONN_LIMIT_TYPE_DVR },
};
return strtab2htsmsg(conn_limit_type_tab);
return strtab2htsmsg(conn_limit_type_tab, 1);
}

const idclass_t access_entry_class = {
.ic_class = "access",
.ic_caption = "Access",
.ic_caption = N_("Access"),
.ic_event = "access",
.ic_perm_def = ACCESS_ADMIN,
.ic_save = access_entry_class_save,
Expand All @@ -1263,52 +1263,52 @@ const idclass_t access_entry_class = {
{
.type = PT_INT,
.id = "index",
.name = "Index",
.name = N_("Index"),
.off = offsetof(access_entry_t, ae_index),
.opts = PO_RDONLY | PO_HIDDEN,
},
{
.type = PT_BOOL,
.id = "enabled",
.name = "Enabled",
.name = N_("Enabled"),
.off = offsetof(access_entry_t, ae_enabled),
},
{
.type = PT_STR,
.id = "username",
.name = "Username",
.name = N_("Username"),
.off = offsetof(access_entry_t, ae_username),
},
{
.type = PT_STR,
.id = "prefix",
.name = "Network prefix",
.name = N_("Network prefix"),
.set = access_entry_class_prefix_set,
.get = access_entry_class_prefix_get,
},
{
.type = PT_BOOL,
.id = "streaming",
.name = "Streaming",
.name = N_("Streaming"),
.off = offsetof(access_entry_t, ae_streaming),
},
{
.type = PT_BOOL,
.id = "adv_streaming",
.name = "Advanced Streaming",
.name = N_("Advanced Streaming"),
.off = offsetof(access_entry_t, ae_adv_streaming),
},
{
.type = PT_BOOL,
.id = "htsp_streaming",
.name = "HTSP Streaming",
.name = N_("HTSP Streaming"),
.off = offsetof(access_entry_t, ae_htsp_streaming),
},
{
.type = PT_STR,
.islist = 1,
.id = "profile",
.name = "Streaming Profiles",
.name = N_("Streaming Profiles"),
.set = access_entry_profile_set,
.get = access_entry_profile_get,
.list = profile_class_get_list,
Expand All @@ -1317,39 +1317,39 @@ const idclass_t access_entry_class = {
{
.type = PT_BOOL,
.id = "dvr",
.name = "Video Recorder",
.name = N_("Video Recorder"),
.off = offsetof(access_entry_t, ae_dvr),
},
{
.type = PT_BOOL,
.id = "htsp_dvr",
.name = "HTSP DVR",
.name = N_("HTSP DVR"),
.off = offsetof(access_entry_t, ae_htsp_dvr),
},
{
.type = PT_BOOL,
.id = "all_dvr",
.name = "All DVR",
.name = N_("All DVR"),
.off = offsetof(access_entry_t, ae_all_dvr),
},
{
.type = PT_BOOL,
.id = "all_rw_dvr",
.name = "All DVR (rw)",
.name = N_("All DVR (rw)"),
.off = offsetof(access_entry_t, ae_all_rw_dvr),
},
{
.type = PT_BOOL,
.id = "failed_dvr",
.name = "Failed DVR",
.name = N_("Failed DVR"),
.off = offsetof(access_entry_t, ae_failed_dvr),
.opts = PO_ADVANCED | PO_HIDDEN,
},
{
.type = PT_STR,
.islist = 1,
.id = "dvr_config",
.name = "DVR Config Profiles",
.name = N_("DVR Config Profiles"),
.set = access_entry_dvr_config_set,
.get = access_entry_dvr_config_get,
.list = dvr_entry_class_config_name_list,
Expand All @@ -1358,53 +1358,53 @@ const idclass_t access_entry_class = {
{
.type = PT_BOOL,
.id = "webui",
.name = "Web Interface",
.name = N_("Web Interface"),
.off = offsetof(access_entry_t, ae_webui),
},
{
.type = PT_BOOL,
.id = "admin",
.name = "Admin",
.name = N_("Admin"),
.off = offsetof(access_entry_t, ae_admin),
},
{
.type = PT_INT,
.id = "conn_limit_type",
.name = "Connection Limit Type",
.name = N_("Connection Limit Type"),
.off = offsetof(access_entry_t, ae_conn_limit_type),
.list = access_entry_conn_limit_type_enum,
},
{
.type = PT_U32,
.id = "conn_limit",
.name = "Limit Connections",
.name = N_("Limit Connections"),
.off = offsetof(access_entry_t, ae_conn_limit),
},
{
.type = PT_S64,
.intsplit = CHANNEL_SPLIT,
.id = "channel_min",
.name = "Min Channel Num",
.name = N_("Min Channel Num"),
.off = offsetof(access_entry_t, ae_chmin),
},
{
.type = PT_S64,
.intsplit = CHANNEL_SPLIT,
.id = "channel_max",
.name = "Max Channel Num",
.name = N_("Max Channel Num"),
.off = offsetof(access_entry_t, ae_chmax),
},
{
.type = PT_BOOL,
.id = "channel_tag_exclude",
.name = "Exclude Channel Tags",
.name = N_("Exclude Channel Tags"),
.off = offsetof(access_entry_t, ae_chtags_exclude),
},
{
.type = PT_STR,
.islist = 1,
.id = "channel_tag",
.name = "Channel Tags",
.name = N_("Channel Tags"),
.set = access_entry_chtag_set,
.get = access_entry_chtag_get,
.list = channel_tag_class_get_list,
Expand All @@ -1413,7 +1413,7 @@ const idclass_t access_entry_class = {
{
.type = PT_STR,
.id = "comment",
.name = "Comment",
.name = N_("Comment"),
.off = offsetof(access_entry_t, ae_comment),
},
{}
Expand Down Expand Up @@ -1613,7 +1613,7 @@ passwd_entry_class_password2_set(void *o, const void *v)

const idclass_t passwd_entry_class = {
.ic_class = "passwd",
.ic_caption = "Passwords",
.ic_caption = N_("Passwords"),
.ic_event = "passwd",
.ic_perm_def = ACCESS_ADMIN,
.ic_save = passwd_entry_class_save,
Expand All @@ -1623,35 +1623,35 @@ const idclass_t passwd_entry_class = {
{
.type = PT_BOOL,
.id = "enabled",
.name = "Enabled",
.name = N_("Enabled"),
.off = offsetof(passwd_entry_t, pw_enabled),
},
{
.type = PT_STR,
.id = "username",
.name = "Username",
.name = N_("Username"),
.off = offsetof(passwd_entry_t, pw_username),
},
{
.type = PT_STR,
.id = "password",
.name = "Password",
.name = N_("Password"),
.off = offsetof(passwd_entry_t, pw_password),
.opts = PO_PASSWORD | PO_NOSAVE,
.set = passwd_entry_class_password_set,
},
{
.type = PT_STR,
.id = "password2",
.name = "Password2",
.name = N_("Password2"),
.off = offsetof(passwd_entry_t, pw_password2),
.opts = PO_PASSWORD | PO_HIDDEN | PO_ADVANCED | PO_WRONCE,
.set = passwd_entry_class_password2_set,
},
{
.type = PT_STR,
.id = "comment",
.name = "Comment",
.name = N_("Comment"),
.off = offsetof(passwd_entry_t, pw_comment),
},
{}
Expand Down
32 changes: 16 additions & 16 deletions src/bouquet.c
View file
Expand Up @@ -788,7 +788,7 @@ bouquet_class_services_count_get ( void *obj )

const idclass_t bouquet_class = {
.ic_class = "bouquet",
.ic_caption = "Bouquet",
.ic_caption = N_("Bouquet"),
.ic_event = "bouquet",
.ic_perm_def = ACCESS_ADMIN,
.ic_save = bouquet_class_save,
Expand All @@ -798,57 +798,57 @@ const idclass_t bouquet_class = {
{
.type = PT_BOOL,
.id = "enabled",
.name = "Enabled",
.name = N_("Enabled"),
.off = offsetof(bouquet_t, bq_enabled),
.notify = bouquet_class_enabled_notify,
},
{
.type = PT_BOOL,
.id = "rescan",
.name = "Rescan",
.name = N_("Rescan"),
.off = offsetof(bouquet_t, bq_rescan),
.notify = bouquet_class_rescan_notify,
.opts = PO_NOSAVE,
},
{
.type = PT_BOOL,
.id = "maptoch",
.name = "Auto-Map to Channels",
.name = N_("Auto-Map to Channels"),
.off = offsetof(bouquet_t, bq_maptoch),
.notify = bouquet_class_maptoch_notify,
},
{
.type = PT_BOOL,
.id = "mapnolcn",
.name = "Map Zero Numbers",
.name = N_("Map Zero Numbers"),
.off = offsetof(bouquet_t, bq_mapnolcn),
.notify = bouquet_class_mapnolcn_notify,
},
{
.type = PT_BOOL,
.id = "mapnoname",
.name = "Map No Name",
.name = N_("Map No Name"),
.off = offsetof(bouquet_t, bq_mapnoname),
.notify = bouquet_class_mapnoname_notify,
},
{
.type = PT_BOOL,
.id = "mapradio",
.name = "Map Radio",
.name = N_("Map Radio"),
.off = offsetof(bouquet_t, bq_mapradio),
.notify = bouquet_class_mapradio_notify,
},
{
.type = PT_BOOL,
.id = "chtag",
.name = "Create Tag",
.name = N_("Create Tag"),
.off = offsetof(bouquet_t, bq_chtag),
.notify = bouquet_class_chtag_notify,
},
{
.type = PT_STR,
.id = "chtag_ref",
.name = "Channel Tag Reference",
.name = N_("Channel Tag Reference"),
.get = bouquet_class_chtag_ref_get,
.set = bouquet_class_chtag_ref_set,
.rend = bouquet_class_chtag_ref_rend,
Expand All @@ -857,21 +857,21 @@ const idclass_t bouquet_class = {
{
.type = PT_STR,
.id = "name",
.name = "Name",
.name = N_("Name"),
.off = offsetof(bouquet_t, bq_name),
},
{
.type = PT_STR,
.id = "source",
.name = "Source",
.name = N_("Source"),
.off = offsetof(bouquet_t, bq_src),
.opts = PO_RDONLY,
},
{
.type = PT_STR,
.islist = 1,
.id = "services",
.name = "Services",
.name = N_("Services"),
.get = bouquet_class_services_get,
.set = bouquet_class_services_set,
.rend = bouquet_class_services_rend,
Expand All @@ -880,27 +880,27 @@ const idclass_t bouquet_class = {
{
.type = PT_U32,
.id = "services_seen",
.name = "# Seen Services",
.name = N_("# Seen Services"),
.off = offsetof(bouquet_t, bq_services_seen),
.opts = PO_RDONLY,
},
{
.type = PT_U32,
.id = "services_count",
.name = "# Services",
.name = N_("# Services"),
.get = bouquet_class_services_count_get,
.opts = PO_RDONLY | PO_NOSAVE,
},
{
.type = PT_STR,
.id = "comment",
.name = "Comment",
.name = N_("Comment"),
.off = offsetof(bouquet_t, bq_comment),
},
{
.type = PT_U32,
.id = "lcn_off",
.name = "Channel Number Offset",
.name = N_("Channel Number Offset"),
.off = offsetof(bouquet_t, bq_lcn_offset),
.notify = bouquet_class_lcn_offset_notify,
},
Expand Down

0 comments on commit 44b6d2d

Please sign in to comment.