diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-20 13:24:50 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-20 13:24:50 +0000 |
commit | 0e263d5b779f19033730fff7ec6f16b0715a976d (patch) | |
tree | 01097b13b3779d85b9bf0d4cf4183555ad36ea13 | |
parent | 24aeac2a754aa310894d3d057e827983b597e4f8 (diff) | |
download | rockbox-0e263d5b779f19033730fff7ec6f16b0715a976d.tar.gz rockbox-0e263d5b779f19033730fff7ec6f16b0715a976d.zip |
accept FS#10992 by Rui Araújo to fix FS#10976 - make the <Untagged> string translatable
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26192 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 15 | ||||
-rw-r--r-- | apps/lang/portugues.lang | 14 | ||||
-rw-r--r-- | apps/tagcache.c | 2 | ||||
-rw-r--r-- | apps/tagcache.h | 3 | ||||
-rw-r--r-- | apps/tagtree.c | 6 |
5 files changed, 37 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 4a4fb2c73a..1b386a5c90 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13731,4 +13731,17 @@ | |||
13731 | gigabeats: "3-D Enhancement" | 13731 | gigabeats: "3-D Enhancement" |
13732 | </voice> | 13732 | </voice> |
13733 | </phrase> | 13733 | </phrase> |
13734 | 13734 | <phrase> | |
13735 | id: LANG_TAGNAVI_UNTAGGED | ||
13736 | desc: "<untagged>" entry in tag browser | ||
13737 | user: core | ||
13738 | <source> | ||
13739 | *: "<Untagged>" | ||
13740 | </source> | ||
13741 | <dest> | ||
13742 | *: "<Untagged>" | ||
13743 | </dest> | ||
13744 | <voice> | ||
13745 | *: "Untagged" | ||
13746 | </voice> | ||
13747 | </phrase> | ||
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index 2f76e4881f..0006512881 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang | |||
@@ -13214,6 +13214,20 @@ | |||
13214 | </voice> | 13214 | </voice> |
13215 | </phrase> | 13215 | </phrase> |
13216 | <phrase> | 13216 | <phrase> |
13217 | id: LANG_TAGNAVI_UNTAGGED | ||
13218 | desc: "<untagged>" entry in tag browser | ||
13219 | user: core | ||
13220 | <source> | ||
13221 | *: "<Untagged>" | ||
13222 | </source> | ||
13223 | <dest> | ||
13224 | *: "<Sem Etiqueta>" | ||
13225 | </dest> | ||
13226 | <voice> | ||
13227 | *: "Sem etiqueta" | ||
13228 | </voice> | ||
13229 | </phrase> | ||
13230 | <phrase> | ||
13217 | id: LANG_OF | 13231 | id: LANG_OF |
13218 | desc: Shown in WPS: X of Y (tracks) | 13232 | desc: Shown in WPS: X of Y (tracks) |
13219 | user: core | 13233 | user: core |
diff --git a/apps/tagcache.c b/apps/tagcache.c index 29c00ae311..affa75db05 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -95,8 +95,6 @@ static long tagcache_stack[(DEFAULT_STACK_SIZE + 0x4000)/sizeof(long)]; | |||
95 | static const char tagcache_thread_name[] = "tagcache"; | 95 | static const char tagcache_thread_name[] = "tagcache"; |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | #define UNTAGGED "<Untagged>" | ||
99 | |||
100 | /* Previous path when scanning directory tree recursively. */ | 98 | /* Previous path when scanning directory tree recursively. */ |
101 | static char curpath[TAG_MAXLEN+32]; | 99 | static char curpath[TAG_MAXLEN+32]; |
102 | 100 | ||
diff --git a/apps/tagcache.h b/apps/tagcache.h index 1488c3bd39..15b4251ddc 100644 --- a/apps/tagcache.h +++ b/apps/tagcache.h | |||
@@ -95,6 +95,9 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title, | |||
95 | /* Serialized DB. */ | 95 | /* Serialized DB. */ |
96 | #define TAGCACHE_STATEFILE ROCKBOX_DIR "/database_state.tcd" | 96 | #define TAGCACHE_STATEFILE ROCKBOX_DIR "/database_state.tcd" |
97 | 97 | ||
98 | /* Tag to be used on untagged files. */ | ||
99 | #define UNTAGGED "<Untagged>" | ||
100 | |||
98 | /* Numeric tags (we can use these tags with conditional clauses). */ | 101 | /* Numeric tags (we can use these tags with conditional clauses). */ |
99 | #define TAGCACHE_NUMERIC_TAGS ((1LU << tag_year) | (1LU << tag_discnumber) | \ | 102 | #define TAGCACHE_NUMERIC_TAGS ((1LU << tag_year) | (1LU << tag_discnumber) | \ |
100 | (1LU << tag_tracknumber) | (1LU << tag_length) | (1LU << tag_bitrate) | \ | 103 | (1LU << tag_tracknumber) | (1LU << tag_length) | (1LU << tag_bitrate) | \ |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 3b13df06ab..8c7f7a2e5d 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -1169,6 +1169,12 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init) | |||
1169 | if (total_count++ < offset) | 1169 | if (total_count++ < offset) |
1170 | continue; | 1170 | continue; |
1171 | 1171 | ||
1172 | if ( strcmp(tcs.result , UNTAGGED ) == 0) | ||
1173 | { | ||
1174 | tcs.result_len = strlcpy(tcs.result, | ||
1175 | str(LANG_TAGNAVI_UNTAGGED), TAG_MAXLEN )+1; | ||
1176 | } | ||
1177 | |||
1172 | dptr->newtable = NAVIBROWSE; | 1178 | dptr->newtable = NAVIBROWSE; |
1173 | if (tag == tag_title || tag == tag_filename) | 1179 | if (tag == tag_title || tag == tag_filename) |
1174 | { | 1180 | { |