yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 19:42:17 +02:00
Code Issues Releases Wiki Activity

localized library type; restored library search

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-14 18:44:47 +01:00
parent f78280c780
commit bc47aabade
20 changed files with 26 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/resources/application/cs.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Czech FBReaderJ resources, by Marek Pavelka -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Neznámý autor"/>
<node name="booksWithNoTags" value="Knihy bez štítků"/>
<node name="demo" value="ukázka"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Podle autora">
<node name="summary" value="Knihy seřazeny podle autora"/>
</node>

4
assets/resources/application/de.xml
View file

@ -4,12 +4,10 @@
<!-- Updated by Ingolf Kübler 2011/06/26 -->
<!-- Updated by Ingolf Kübler 2011/07/03 -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Unbekannte Autoren"/>
<node name="booksWithNoTags" value="Bücher ohne Schlagwörter"/>
<node name="demo" value="Leseprobe"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Nach Autoren gruppiert">
<node name="summary" value="Bücher nach Autoren auswählen"/>
</node>

4
assets/resources/application/en.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- English FBReaderJ resources, by Geometer Plus -->
<resources>
<node name="library">
<node name="library" value="FBReader library">
<node name="unknownAuthor" value="Unknown author"/>
<node name="booksWithNoTags" value="Books with no tags"/>
<node name="demo" value="sample"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="By author">
<node name="summary" value="Books sorted by author"/>
</node>

6
assets/resources/application/fr.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- French FBReaderJ resources; Initial work: Sébastien Rodriguez Maintainer: Mathias Monnerville <mathias@monnerville.com> -->
<!-- French FBReaderJ resources; Initial work: Sébastien Rodriguez; Maintainer: Mathias Monnerville <mathias@monnerville.com> -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Auteur inconnu"/>
<node name="booksWithNoTags" value="Livres sans étiquettes"/>
<node name="demo" value="l'extrait"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Par auteur">
<node name="summary" value="Livres triés par auteur"/>
</node>

4
assets/resources/application/gl.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Galician FBReaderJ resources, by Miguel Anxo Bouzada mbouzada[at]gmail.com -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Autor descoñecido"/>
<node name="booksWithNoTags" value="Libros sen etiqueta"/>
<node name="demo" value="mostra"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Por autor">
<node name="summary" value="Libros ordenados por autor"/>
</node>

4
assets/resources/application/hu.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Hungarian FBReaderJ resources, by L. B. Szabó. Based on FBReader translation by Sándor Gábor -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Ismeretlen szerző"/>
<node name="booksWithNoTags" value="Címke nélküli könyvek"/>
<node name="demo" value="minta"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Szerzők">
<node name="summary" value="Könyvek szerzők szerint"/>
</node>

4
assets/resources/application/it.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Italian FBReaderJ resources, by Vytek and Neoxx from AndDev.it Translate Team -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Autore sconosciuto"/>
<node name="booksWithNoTags" value="Libri con nessuna etichetta"/>
<node name="demo" value="esempio"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Per autore">
<node name="summary" value="Books sorted by author" toBeTranslated="true"/>
</node>

4
assets/resources/application/nl.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Dutch FBReader resources, by Frank Fesevur 12-Jan-2011. Updated 22-Jun-2011. -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Onbekende auteur"/>
<node name="booksWithNoTags" value="Boeken zonder trefwoorden"/>
<node name="demo" value="voorbeeld"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Auteurs">
<node name="summary" value="Boeken gesorteerd op auteur"/>
</node>

4
assets/resources/application/ru.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Russian FBReaderJ resources, by Geometer Plus -->
<resources>
<node name="library">
<node name="library" value="FBReader: библиотека">
<node name="unknownAuthor" value="Автор не указан"/>
<node name="booksWithNoTags" value="Книги вне категорий"/>
<node name="demo" value="фрагмент"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Авторы">
<node name="summary" value="Книги, разложенные по авторам"/>
</node>

4
assets/resources/application/th.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Thai FBReaderJ resources, by Samphan Pojanasophanakul -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="ไม่ทราบชื่อผู้แต่ง"/>
<node name="booksWithNoTags" value="หนังสือที่ไม่มีแท็ก"/>
<node name="demo" value="ตัวอย่าง"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="ชื่อผู้แต่ง ">
<node name="summary" value="เรียงตามชื่อผู้แต่ง"/>
</node>

4
assets/resources/application/uk.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Ukrainian FBReaderJ resources, by Dmytro Shevchenko -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Автор не вказаний"/>
<node name="booksWithNoTags" value="Книги поза категоріями"/>
<node name="demo" value="уривок"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Автори">
<node name="summary" value="Books sorted by author" toBeTranslated="true"/>
</node>

4
assets/resources/application/vi.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Vietnamese FBReaderJ resources, by Phạm Văn Hùng_Firestork -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="Tác giả chưa biết"/>
<node name="booksWithNoTags" value="Sách không từ khóa"/>
<node name="demo" value="xem thử"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="Theo tác giả">
<node name="summary" value="Sách được xếp theo tác giả"/>
</node>

4
assets/resources/application/zh.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Chinese FBReaderJ resources, by http://shucang.com/ -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="佚名" />
<node name="booksWithNoTags" value="未归类" />
<node name="demo" value="试读本" />
</node>
<node name="libraryView">
<node name="byAuthor" value="作者">
<node name="summary" value="按作者排序" />
</node>

4
assets/resources/application/zh_TW.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Traditional Chinese FBReaderJ resources, by Fung.T -->
<resources>
<node name="library">
<node name="library" value="FBReader library" toBeTranslated="true">
<node name="unknownAuthor" value="佚名"/>
<node name="booksWithNoTags" value="未歸類"/>
<node name="demo" value="試讀本"/>
</node>
<node name="libraryView">
<node name="byAuthor" value="作者">
<node name="summary" value="按作者排序"/>
</node>

9
src/org/geometerplus/android/fbreader/library/BaseActivity.java
View file

@ -81,13 +81,10 @@ abstract class BaseActivity extends ListActivity implements View.OnCreateContext
}
final FBTree.Key key = (FBTree.Key)getIntent().getSerializableExtra(TREE_KEY_KEY);
if (key != null) {
myCurrentTree = LibraryInstance.getLibraryTree(key);
myCurrentTree = key != null
? LibraryInstance.getLibraryTree(key)
: LibraryInstance.getRootTree();
setTitle(myCurrentTree.getTreeTitle());
} else {
myCurrentTree = null;
requestWindowFeature(Window.FEATURE_NO_TITLE);
}
mySelectedBookPath = getIntent().getStringExtra(SELECTED_BOOK_PATH_KEY);
mySelectedBook = null;

4
src/org/geometerplus/android/fbreader/library/LibraryTopLevelActivity.java
View file

@ -38,7 +38,7 @@ public class LibraryTopLevelActivity extends LibraryBaseActivity {
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
new ListAdapter(this, LibraryInstance.getRootTree().subTrees());
new ListAdapter(this, myCurrentTree.subTrees());
onNewIntent(getIntent());
}
@ -50,7 +50,7 @@ public class LibraryTopLevelActivity extends LibraryBaseActivity {
}
private void setSearchResults() {
final List<FBTree> trees = LibraryInstance.getRootTree().subTrees();
final List<FBTree> trees = myCurrentTree.subTrees();
getListAdapter().replaceAll(trees);
getListView().invalidateViews();
new OpenTreeRunnable(trees.get(0)).run();

4
src/org/geometerplus/fbreader/library/AuthorTree.java
View file

@ -19,8 +19,6 @@
package org.geometerplus.fbreader.library;
import org.geometerplus.zlibrary.core.resources.ZLResource;
public class AuthorTree extends LibraryTree {
public final Author Author;
@ -38,7 +36,7 @@ public class AuthorTree extends LibraryTree {
return
(Author != null) ?
Author.DisplayName :
ZLResource.resource("library").getResource("unknownAuthor").getValue();
Library.resource().getResource("unknownAuthor").getValue();
}
@Override

3
src/org/geometerplus/fbreader/library/Book.java
View file

@ -23,7 +23,6 @@ import java.util.*;
import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.text.view.ZLTextPosition;
@ -143,7 +142,7 @@ public class Book {
}
final String demoPathPrefix = Paths.BooksDirectoryOption().getValue() + java.io.File.separator + "Demos" + java.io.File.separator;
if (File.getPath().startsWith(demoPathPrefix)) {
final String demoTag = ZLResource.resource("library").getResource("demo").getValue();
final String demoTag = Library.resource().getResource("demo").getValue();
setTitle(getTitle() + " (" + demoTag + ")");
addTag(demoTag);
}

2
src/org/geometerplus/fbreader/library/Library.java
View file

@ -46,7 +46,7 @@ public final class Library {
public static final String ROOT_FILE_TREE = "fileTree";
public static ZLResource resource() {
return ZLResource.resource("libraryView");
return ZLResource.resource("library");
}
private final List<Book> myBooks = new LinkedList<Book>();

8
src/org/geometerplus/fbreader/library/TagTree.java
View file

@ -19,8 +19,6 @@
package org.geometerplus.fbreader.library;
import org.geometerplus.zlibrary.core.resources.ZLResource;
public final class TagTree extends LibraryTree {
public final Tag Tag;
@ -31,10 +29,8 @@ public final class TagTree extends LibraryTree {
@Override
public String getName() {
return
(Tag != null) ?
Tag.Name :
ZLResource.resource("library").getResource("booksWithNoTags").getValue();
return Tag != null
? Tag.Name : Library.resource().getResource("booksWithNoTags").getValue();
}
@Override