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
This commit is contained in:
Jonathan Gordon 2010-05-20 13:24:50 +00:00
parent 24aeac2a75
commit 0e263d5b77
5 changed files with 37 additions and 3 deletions

View file

@ -13731,4 +13731,17 @@
gigabeats: "3-D Enhancement" gigabeats: "3-D Enhancement"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_TAGNAVI_UNTAGGED
desc: "<untagged>" entry in tag browser
user: core
<source>
*: "<Untagged>"
</source>
<dest>
*: "<Untagged>"
</dest>
<voice>
*: "Untagged"
</voice>
</phrase>

View file

@ -13213,6 +13213,20 @@
usb_hid: "Modo de Apresentação" usb_hid: "Modo de Apresentação"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_TAGNAVI_UNTAGGED
desc: "<untagged>" entry in tag browser
user: core
<source>
*: "<Untagged>"
</source>
<dest>
*: "<Sem Etiqueta>"
</dest>
<voice>
*: "Sem etiqueta"
</voice>
</phrase>
<phrase> <phrase>
id: LANG_OF id: LANG_OF
desc: Shown in WPS: X of Y (tracks) desc: Shown in WPS: X of Y (tracks)

View file

@ -95,8 +95,6 @@ static long tagcache_stack[(DEFAULT_STACK_SIZE + 0x4000)/sizeof(long)];
static const char tagcache_thread_name[] = "tagcache"; static const char tagcache_thread_name[] = "tagcache";
#endif #endif
#define UNTAGGED "<Untagged>"
/* Previous path when scanning directory tree recursively. */ /* Previous path when scanning directory tree recursively. */
static char curpath[TAG_MAXLEN+32]; static char curpath[TAG_MAXLEN+32];

View file

@ -95,6 +95,9 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
/* Serialized DB. */ /* Serialized DB. */
#define TAGCACHE_STATEFILE ROCKBOX_DIR "/database_state.tcd" #define TAGCACHE_STATEFILE ROCKBOX_DIR "/database_state.tcd"
/* Tag to be used on untagged files. */
#define UNTAGGED "<Untagged>"
/* Numeric tags (we can use these tags with conditional clauses). */ /* Numeric tags (we can use these tags with conditional clauses). */
#define TAGCACHE_NUMERIC_TAGS ((1LU << tag_year) | (1LU << tag_discnumber) | \ #define TAGCACHE_NUMERIC_TAGS ((1LU << tag_year) | (1LU << tag_discnumber) | \
(1LU << tag_tracknumber) | (1LU << tag_length) | (1LU << tag_bitrate) | \ (1LU << tag_tracknumber) | (1LU << tag_length) | (1LU << tag_bitrate) | \

View file

@ -1169,6 +1169,12 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
if (total_count++ < offset) if (total_count++ < offset)
continue; continue;
if ( strcmp(tcs.result , UNTAGGED ) == 0)
{
tcs.result_len = strlcpy(tcs.result,
str(LANG_TAGNAVI_UNTAGGED), TAG_MAXLEN )+1;
}
dptr->newtable = NAVIBROWSE; dptr->newtable = NAVIBROWSE;
if (tag == tag_title || tag == tag_filename) if (tag == tag_title || tag == tag_filename)
{ {