From d9f29c7b25ec3fcb109d154e79a021bc76f9cf63 Mon Sep 17 00:00:00 2001 From: seven332 Date: Mon, 24 Aug 2015 21:45:00 +0800 Subject: [PATCH] Update string.xml --- .../ehviewer/ui/scene/DownloadLabelScene.java | 35 ++------ .../ehviewer/ui/scene/DownloadScene.java | 8 +- .../ehviewer/ui/scene/GalleryDetailScene.java | 4 +- .../ehviewer/ui/scene/GalleryListScene.java | 10 +-- .../ui/scene/ModifyQuickSearchScene.java | 2 +- .../ehviewer/ui/scene/QuickSearchScene.java | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 82 ++++++++++++++++++- app/src/main/res/values/strings.xml | 19 ++++- 8 files changed, 117 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java index 67cddb5f1..625eed3a5 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java @@ -41,35 +41,22 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. private List mDownloadLabels; - private boolean mChanged = false; - private static final int POSITION_ADD = 0; @Override protected void onCreate(boolean rebirth) { super.onCreate(rebirth); - setTipText("No download label"); // TODO hardcode + setTipText(getResources().getString(R.string.download_label_list_empty)); addAction(R.drawable.ic_plus_dark_x24); setOnClickActionListener(this); } - @Override - protected void onDestroy(boolean die) { - super.onDestroy(die); - - // notify update - if (mChanged) { - //Messenger.getInstance().notify(Constants.MESSENGER_ID_UPDATE_DOWNLOAD_LABEL, null); - mChanged = false; - } - } - @Override protected String getTitle() { - return "Download label"; // TODO hardcode + return getResources().getString(R.string.download_label); } @Override @@ -79,7 +66,7 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. } - private class AddDownloadTagHelper implements SimpleDialog.OnCreateCustomViewListener, + private class AddDownloadLabelHelper implements SimpleDialog.OnCreateCustomViewListener, SimpleDialog.OnClickListener { private EditText mEditText; @@ -87,7 +74,7 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. @Override public void onCreateCustomView(final SimpleDialog dialog, View view) { FloatLabelEditText floatLabelEditText = (FloatLabelEditText) view.findViewById(R.id.float_label_edit_text); - floatLabelEditText.setHint("Download label"); // TODO hardcode + floatLabelEditText.setHint(getResources().getString(R.string.label)); mEditText = (EditText) view.findViewById(R.id.edit_text); mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override @@ -116,10 +103,10 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. if (which == SimpleDialog.POSITIVE) { String label = mEditText.getText().toString().trim(); if (TextUtils.isEmpty(label)) { - Toast.makeText(getStageActivity(), "Empty label", Toast.LENGTH_SHORT).show(); // TODO hardcode + Toast.makeText(getStageActivity(), R.string.empty_label, Toast.LENGTH_SHORT).show(); return false; } else if (containLabel(label)) { - Toast.makeText(getStageActivity(), "The label already exists", Toast.LENGTH_SHORT).show(); // TODO hardcode + Toast.makeText(getStageActivity(), R.string.label_exists, Toast.LENGTH_SHORT).show(); return false; } else { // Tell DownloadManager @@ -132,8 +119,6 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. mDownloadLabels.clear(); mDownloadLabels.addAll(DBUtils.getAllDownloadLabelWithId()); notifyDataSetChanged(); - - mChanged = true; return true; } } else { @@ -146,8 +131,8 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. public void onClickAction(int index) { switch (index) { case POSITION_ADD: - AddDownloadTagHelper helper = new AddDownloadTagHelper(); - new SimpleDialog.Builder(getContext()).setTitle("Add download tag") + AddDownloadLabelHelper helper = new AddDownloadLabelHelper(); + new SimpleDialog.Builder(getContext()).setTitle(R.string.add_download_label) .setCustomView(R.layout.dialog_edit_text, helper) .setPositiveButton(android.R.string.ok) .setOnButtonClickListener(helper).show(this); @@ -178,8 +163,6 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. modify.label = getData(fromPosition); modify.label2 = getData(toPosition); Messenger.getInstance().notify(Constants.MESSENGER_ID_MODIFY_DOWNLOAD_LABEL_FROM_SCENE, modify); - - mChanged = true; } @Override @@ -188,8 +171,6 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene. modify.ops = DownloadManager.DownloadLabelModify.OPS_REMOVE; modify.label = getData(position); Messenger.getInstance().notify(Constants.MESSENGER_ID_MODIFY_DOWNLOAD_LABEL_FROM_SCENE, modify); - - mChanged = true; } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java index 4b659080f..039e0918b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java @@ -145,7 +145,7 @@ public class DownloadScene extends AppbarScene implements DrawerProvider, } else { label = mActivatedLabel; } - setTitle("Download" + " - " + label); // TODO hardcode + setTitle(getResources().getString(R.string.download_title, label)); } @Override @@ -192,7 +192,7 @@ public class DownloadScene extends AppbarScene implements DrawerProvider, mOriginalFabLayoutPaddingBottom = mFabLayout.getPaddingBottom(); mRightDrawerView = new AppbarRecyclerView(getStageActivity()); - mRightDrawerView.setTitle("Label"); // TODO hardcode + mRightDrawerView.setTitle(getResources().getString(R.string.label)); mDownloadLabelAdapter = new DownloadLabelAdapter(); mRightDrawerView.setAdapter(mDownloadLabelAdapter); mRightDrawerView.setOnItemClickListener(new DownloadTagClickListener()); @@ -650,9 +650,9 @@ public class DownloadScene extends AppbarScene implements DrawerProvider, } if (labels.isEmpty()) { - Toast.makeText(getContext(), "No available label", Toast.LENGTH_SHORT).show(); // TODO hardcode + Toast.makeText(getContext(), R.string.no_label_available, Toast.LENGTH_SHORT).show(); } else { - new SimpleDialog.Builder(getContext()).setTitle("Move to") // TODO hardcode + new SimpleDialog.Builder(getContext()).setTitle(R.string.move_to) .setItems(labels.toArray(new String[labels.size()]), new MoveDownloadInfoListener(labels, hasDefaultLabel)).show(this); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 47eaeaa29..49ff72a7d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -598,8 +598,8 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener, DownloadLabelHelper helper = new DownloadLabelHelper(); new ListViewCheckBoxDialog.Builder(getContext()) .setListItems(helper.mLabels, helper) - .setCheckBoxText("Remeber") // TODO hardcode - .setTitle("Choose label") // TODO hardcode + .setCheckBoxText(getResources().getString(R.string.remeber)) + .setTitle(R.string.choose_label) .setOnCloseListener(helper) .show(this); } else if (mRead == v) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index e4538f7c6..a8f4ea694 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -334,7 +334,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe mRightDrawerView.setAdapter(mQuickSearchAdapter); mRightDrawerView.setOnItemClickListener(new QuickSearchClickListener()); mRightDrawerView.setHelper(this); - mRightDrawerView.setTipText("No quick search"); // TODO hardcode + mRightDrawerView.setTipText(getResources().getString(R.string.quick_search_list_empty)); if (mQuickSearchAdapter.getItemCount() == 0) { mRightDrawerView.showTip(false); } else { @@ -605,12 +605,10 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe if (mode == ListUrlBuilder.MODE_NORMAL || mode == ListUrlBuilder.MODE_UPLOADER || mode == ListUrlBuilder.MODE_TAG) { AddToQuickSearchHelper helper = new AddToQuickSearchHelper(mListUrlBuilder.clone()); - new SimpleDialog.Builder(getStageActivity()).setTitle("Add to quick search") // TODO hardcode + new SimpleDialog.Builder(getStageActivity()).setTitle(R.string.add_to_quick_search) .setCustomView(R.layout.dialog_edit_text, helper) .setPositiveButton(android.R.string.ok) .setOnButtonClickListener(helper).show(this); - } else { - Toast.makeText(getStageActivity(), "Can't add", Toast.LENGTH_SHORT).show(); // TODO hardcode } } @@ -864,7 +862,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe Messenger.getInstance().notify(Constants.MESSENGER_ID_UPDATE_QUICK_SEARCH, null); return true; } else { - Toast.makeText(getStageActivity(), "Empty displayname", Toast.LENGTH_SHORT).show(); // TODO hardcode + Toast.makeText(getStageActivity(), R.string.empty_displayname, Toast.LENGTH_SHORT).show(); return false; } } else { @@ -881,7 +879,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe // Set keyword from search bar builder.setKeyword(mSearchBar.getText()); AddToQuickSearchHelper helper = new AddToQuickSearchHelper(builder); - new SimpleDialog.Builder(getStageActivity()).setTitle("Add to quick search") // TODO hardcode + new SimpleDialog.Builder(getStageActivity()).setTitle(R.string.add_to_quick_search) .setCustomView(R.layout.dialog_edit_text, helper) .setPositiveButton(android.R.string.ok) .setOnButtonClickListener(helper).show(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java index 514a86469..7cdf84fe6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java @@ -166,7 +166,7 @@ public class ModifyQuickSearchScene extends AppbarScene implements SearchLayout. setTitle(getName()); return true; } else { - Toast.makeText(getStageActivity(), "Empty displayname", Toast.LENGTH_SHORT).show(); // TODO hardcode + Toast.makeText(getStageActivity(), R.string.empty_displayname, Toast.LENGTH_SHORT).show(); return false; } } else { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java index fe5b896c6..9e2da9ca6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java @@ -50,7 +50,7 @@ public class QuickSearchScene extends AbsDragSortScene implements Messenger.Rece protected void onCreate(boolean rebirth) { super.onCreate(rebirth); - setTipText("No quick search"); // TODO hardcode + setTipText(getResources().getString(R.string.quick_search_list_empty)); } @Override diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6b5063b62..bf0230499 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -23,6 +23,7 @@ 高级选项 标签搜索 图片搜索 + 指定画廊 指定上传者 指定标签 没关键字也行 @@ -53,6 +54,12 @@ 4 星 5 星 + + 快速搜索 + 添加快速搜索 + 名称为空 + 快速搜索列表为空 + 第 %1$d 页，共 %2$s 页 跳至 @@ -65,9 +72,12 @@ %d \u2665 更多信息 大家感觉 %s + 暂无标签 暂无评论 暂无更多评论 更多评论 + 评价成功 + 评价失败 已复制到剪切板 @@ -110,11 +120,23 @@ 太多重定向 网络错误 奇怪的问题 - 联网了么？ + 非法输入 + 没联网？ 显示 + 阅读 + 阅读方向 + 从左至右 + 从右至左 + 从上至下 + 隐藏导航栏 + 仅在 Android 4.4 及以上有效 + 沉浸全屏模式 + 不隐藏状态栏 + 音量键翻页 + EH 源 日文标题 尝试显示日文标题 @@ -125,6 +147,10 @@ 一般 较大 + Download + 图片下载目录 + 归档文件下载目录 + 高级 显示应用状态 在屏幕右上角显示设备状态 @@ -141,6 +167,13 @@ 翻译 改写 + + 选择目录 + 无法获取目录 + 无法写入该目录 + 无法解析文档 uri + Lollipop 提供了新的读写外置存储设备的 API，也就是 SD 卡。这需要用户的辅助操作。如果你想要把下载路径设置到 SD 卡，请点击“文档”按钮。 + 日语 英语 汉语 @@ -163,12 +196,47 @@ “啥？” “我把熊猫给丢了……” + + 下载服务 + 停止 + 全部停止 + 下载成功 + 未完全下载 + 下载完成 + + 一项下载成功 + %d 项下载成功 + + + 一项未完全下载 + %d 项未完全下载 + + 未启动 + 等待中 + 已完成 + 未完成 + + + 下载列表为空 + 下载标签 + 全部 + 默认 + 标签为空 + 该标签已存在 + 下载标签列表为空 + 添加下载标签 + 没有可用下载标签 + 标签 + 下载 - %s + 选择标签 + 关键字 搜索 重试 跳页 - 未知 + 应用 + 首页 热门 历史 @@ -182,10 +250,20 @@ 用户名 密码 + 名称 + 阅读 种子 分享 + 评价 评论 + 信息 + + 文档 + 重命名 + + 移动到 … + 记住 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37d8c4005..a4a3f2097 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,6 +73,9 @@ Quick search + Add to quick search + Empty displayname + Quick search list is empty Page %1$d, %2$s pages in total @@ -135,7 +138,7 @@ Network error Weird Invalid input - Network available ? + Offline ? Can\'t find target Activity @@ -192,7 +195,7 @@ Can\'t get folder Can\'t write to this folder Can\'t parse document uri - Lollipop provides an API to write to secondary external storage devices, namely SD card. If you want to set download location to SD card, click the \"DOCUMENT\" button. + Lollipop provides an API to write to secondary external storage devices, namely SD card. Your operation is necessary. If you want to set download location to SD card, click the \"DOCUMENT\" button. Japanese English @@ -238,8 +241,17 @@ Download list is empty + Download label All Default + Empty label + The label already exists + Download label list is empty + Add download label + No label available + Label + Download - %s + Choose label Keyword Search @@ -274,4 +286,7 @@ Document Rename + Move to … + Remeber +