Skip to content

Commit

Permalink
translated the app to Japanese
Browse files Browse the repository at this point in the history
  • Loading branch information
oliexdev committed Jun 28, 2015
1 parent 93f8b9d commit 6aa50d7
Show file tree
Hide file tree
Showing 9 changed files with 149 additions and 54 deletions.
2 changes: 1 addition & 1 deletion android_app/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<activity android:name="com.health.openscale.gui.SettingsActivity"></activity>
<activity android:name="com.health.openscale.gui.NewEntryActivity" android:theme="@android:style/Theme.Holo.Light.Dialog" android:label="@string/title_new_data_entry"></activity>
<activity android:name="com.health.openscale.gui.EditDataActivity" android:theme="@android:style/Theme.Holo.Light.Dialog" android:label="@string/title_edit_data_entry"></activity>
<activity android:name=".gui.UserSettingsActivity" android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/title_user"></activity>
<activity android:name=".gui.UserSettingsActivity" android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/label_title_user"></activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import com.health.openscale.core.OpenScale;
import com.health.openscale.core.ScaleData;

import java.text.SimpleDateFormat;
import java.text.DateFormat;

public class EditDataActivity extends Activity {

Expand Down Expand Up @@ -74,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
txtMuscle.setText(editScaleData.muscle+"");
txtComment.setText(editScaleData.comment);

setTitle(getResources().getString(R.string.title_edit_data_entry) + ": " + new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(editScaleData.date_time));
setTitle(getResources().getString(R.string.title_edit_data_entry) + ": " + DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(editScaleData.date_time));

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.health.openscale.core.ScaleData;
import com.health.openscale.core.ScaleUser;

import java.text.SimpleDateFormat;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
Expand Down Expand Up @@ -196,7 +196,7 @@ private void updateGoal(ArrayList<ScaleData> scaleDataList) {
txtGoalWeight.setText(currentScaleUser.goal_weight + " " + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit]);

double weight_diff = currentScaleUser.goal_weight - lastScaleData.weight;
txtGoalDiff.setText(String.format("%.1f" + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit], weight_diff));
txtGoalDiff.setText(String.format("%.1f " + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit], weight_diff));

Calendar goalDate = Calendar.getInstance();
Calendar curDate = Calendar.getInstance();
Expand All @@ -205,9 +205,9 @@ private void updateGoal(ArrayList<ScaleData> scaleDataList) {
long days = daysBetween(curDate, goalDate);
txtGoalDayLeft.setText(days + " " + getResources().getString(R.string.label_days));

txtLabelGoalWeight.setText(Html.fromHtml(getResources().getString(R.string.label_weight_goal) + " <br> <font color='grey'><small>BMI " + String.format("%.1f", currentScaleUser.getBMI(currentScaleUser.goal_weight)) + " </small></font>"));
txtLabelGoalWeight.setText(Html.fromHtml(getResources().getString(R.string.label_goal_weight) + " <br> <font color='grey'><small>BMI " + String.format("%.1f", currentScaleUser.getBMI(currentScaleUser.goal_weight)) + " </small></font>"));
txtLabelGoalDiff.setText(Html.fromHtml(getResources().getString(R.string.label_weight_difference) + " <br> <font color='grey'><small>BMI " + String.format("%.1f", currentScaleUser.getBMI(lastScaleData.weight) - currentScaleUser.getBMI(currentScaleUser.goal_weight)) + " </small></font>"));
txtLabelDayLeft.setText(Html.fromHtml(getResources().getString(R.string.label_days_left) + " <br> <font color='grey'><small>" + getResources().getString(R.string.label_goal_date_is) + " " + new SimpleDateFormat("dd. MMM yyyy (EE)").format(currentScaleUser.goal_date) + " </small></font>"));
txtLabelDayLeft.setText(Html.fromHtml(getResources().getString(R.string.label_days_left) + " <br> <font color='grey'><small>" + getResources().getString(R.string.label_goal_date_is) + " " + DateFormat.getDateInstance(DateFormat.LONG).format(currentScaleUser.goal_date) + " </small></font>")); // currentScaleUser.goal_date

if (scaleDataList.size() > 2) {
ScaleData diffScaleData = scaleDataList.get(1);
Expand Down Expand Up @@ -354,9 +354,9 @@ private void updateLastLineChart(ArrayList<ScaleData> scaleDataList) {
long days = 0 - daysBetween(lastDate, histDate);

if (days == 0) {
axisValues.add(new AxisValue(i, new SimpleDateFormat("dd/MM/yy").format(lastScaleData.date_time).toCharArray()));
axisValues.add(new AxisValue(i, DateFormat.getDateInstance(DateFormat.SHORT).format(lastScaleData.date_time).toCharArray()));
} else {
axisValues.add(new AxisValue(i, String.format("%d days", days).toCharArray()));
axisValues.add(new AxisValue(i, String.format("%d " + getResources().getString(R.string.label_days), days).toCharArray()));
}
}

Expand Down Expand Up @@ -431,7 +431,7 @@ private void updateLastPieChart() {
pieChartData.setHasLabels(false);
pieChartData.setHasCenterCircle(true);
pieChartData.setCenterText1(Float.toString(lastScaleData.weight) + " " + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit]);
pieChartData.setCenterText2(new SimpleDateFormat("dd. MMM yyyy").format(lastScaleData.date_time));
pieChartData.setCenterText2(DateFormat.getDateInstance(DateFormat.MEDIUM).format(lastScaleData.date_time));


if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE ||
Expand Down Expand Up @@ -468,8 +468,7 @@ public void onValueSelected(int i, SliceValue arcValue) {
return;
}


String date_time = new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(lastScaleData.date_time);
String date_time = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT).format(lastScaleData.date_time);

switch (i) {
case 0:
Expand Down Expand Up @@ -515,7 +514,7 @@ public void onValueSelected(int lineIndex, int pointIndex, PointValue pointValue
ScaleData scaleData = scaleDataLastDays.get(pointIndex);
lines selectedLine = activeLines.get(lineIndex);

String date_time = new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(scaleData.date_time);
String date_time = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT).format(scaleData.date_time);

switch (selectedLine) {
case WEIGHT:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ private void updateUserPreferences()
Preference prefAddUser = new Preference(this);

prefAddUser.setOnPreferenceClickListener(new onClickListenerAddUser());
prefAddUser.setTitle("+ Add User");
prefAddUser.setTitle("+ " + getResources().getString(R.string.label_add_user));

usersCategory.addPreference(prefAddUser);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import com.health.openscale.core.ScaleData;

import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;

Expand Down Expand Up @@ -113,9 +114,9 @@ public void updateOnView(ArrayList<ScaleData> scaleDataList)
TextView dateTextView = new TextView(tableView.getContext());
if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE ||
(getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE) {
dateTextView.setText(new SimpleDateFormat("dd. MMM yyyy (EE)").format(scaleData.date_time));
dateTextView.setText(DateFormat.getDateInstance(DateFormat.MEDIUM).format(scaleData.date_time));
} else{
dateTextView.setText(new SimpleDateFormat("dd/MM/yy").format(scaleData.date_time));
dateTextView.setText(DateFormat.getDateInstance(DateFormat.SHORT).format(scaleData.date_time));
}
dateTextView.setPadding(0, 5, 5, 5);
dataRow.addView(dateTextView);
Expand Down
32 changes: 16 additions & 16 deletions android_app/app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<string name="error_exporting">Fehler beim Exportieren</string>
<string name="error_fat_value_required">Fettanteil ist erforderlich!</string>
<string name="error_importing">Fehler beim Importieren</string>
<string name="error_muscle_value_required">Muskelwert ist erforderlich!</string>
<string name="error_user_name_required">Fehller Benutzername ist erfoderlich!</string>
<string name="error_value_range_0_100">Wert muss zwischen 0 und 100 liegen!</string>
<string name="error_value_range_0_300">Wert muss zwischen 0 und 300 liegen!</string>
<string name="error_water_value_required">Wasseranteil ist erforderlich!</string>
<string name="error_muscle_value_required">Muskelanteil ist erforderlich!</string>
<string name="error_user_name_required">Fehler Benutzername ist erfoderlich!</string>
<string name="error_value_range_0_100">Der Wert muss zwischen 0 und 100 liegen!</string>
<string name="error_value_range_0_300">Der Wert muss zwischen 0 und 300 liegen!</string>
<string name="error_water_value_required">Wassergehalt ist erforderlich!</string>
<string name="error_weight_value_required">Gewicht ist erforderlich!</string>
<string name="info_bluetooth_disable">Das Suchen nach einer Bluetooth Waage ist ausgeschaltet</string>
<string name="info_bluetooth_enable">Das Suchen nach einer Bluetooth Waage ist eingeschaltet</string>
<string name="info_bluetooth_disable">ist ausgeschaltet</string>
<string name="info_bluetooth_enable">ist eingeschaltet</string>
<string name="info_bluetooth_not_established">Bluetooth Verbindung konnte nicht hergestellt werden</string>
<string name="info_data_all_deleted">Alle Datenbank Einträge wurden gelöscht!</string>
<string name="info_data_deleted">Datenbank wurde gelöscht!</string>
Expand All @@ -27,8 +27,8 @@
<string name="info_enter_value_cm">Gebe deine Körpergröße in cm an</string>
<string name="info_enter_value_percent">Gebe dein Wert in % an</string>
<string name="info_enter_value_unit">Gebe dein Wert an in</string>
<string name="info_is_not_visible">Ist nicht sichtbar</string>
<string name="info_is_visible">Ist sichtbar</string>
<string name="info_is_not_visible">ist nicht sichtbar</string>
<string name="info_is_visible">ist sichtbar</string>
<string name="info_no_selected_user">Kein Benutzer existiert! Bitte lege einen neuen Benutzer unter Einstellungen an</string>
<string name="info_on_date">am</string>
<string name="info_set_filename">Setzte Dateiname auf</string>
Expand All @@ -38,7 +38,7 @@
<string name="info_your_weight">Dein Gewicht war</string>
<string name="label_add">Hinzufügen</string>
<string name="label_birthday">Geburtstag</string>
<string name="label_bluetooth_enable">Such Modus</string>
<string name="label_bluetooth_enable">Suche nach Bluetooth Waage</string>
<string name="label_bluetooth_title">Bluetooth</string>
<string name="label_bmi">BMI</string>
<string name="label_body_height">Körpergröße</string>
Expand All @@ -50,13 +50,13 @@
<string name="label_delete">Löschen</string>
<string name="label_delete_all">Alles löschen</string>
<string name="label_device_name">Gerätename</string>
<string name="label_enable_fat">Fettanteillinie</string>
<string name="label_enable_fat">Körperfettanteillinie</string>
<string name="label_enable_labels">Notiz auf den Datenpunkten</string>
<string name="label_enable_muscle">Muskelanteillinie</string>
<string name="label_enable_water">Wasseranteillinie</string>
<string name="label_enable_water">Wassergehaltslinie</string>
<string name="label_enable_weight">Gewichtslinie</string>
<string name="label_export">Exportieren</string>
<string name="label_fat">Fettanteil</string>
<string name="label_fat">Körperfettanteil</string>
<string name="label_gender">Geschlecht</string>
<string name="label_goal_date">Zieldatum</string>
<string name="label_goal_date_is">Das Zieldatum ist</string>
Expand All @@ -78,10 +78,9 @@
<string name="label_title_statistics">Statistiken</string>
<string name="label_title_user">Benutzer</string>
<string name="label_user_name">Name</string>
<string name="label_water">Wasseranteil</string>
<string name="label_water">Wassergehalt</string>
<string name="label_weight">Gewicht</string>
<string name="label_weight_difference">Gewichtsunterschied</string>
<string name="label_weight_goal">Gewichtsziel</string>
<string name="label_woman">Weiblich</string>
<string name="label_yes">Ja</string>
<string name="question_really_delete_user">Wollen Sie wirklich den Benutzer löschen?</string>
Expand All @@ -91,5 +90,6 @@
<string name="title_graph">Diagramm</string>
<string name="title_new_data_entry">Dateneingabe</string>
<string name="title_overview">Übersicht</string>
<string name="title_user">Benutzer</string>
<string name="title_users">Benutzer</string>
<string name="label_add_user">Benutzer hinzufügen</string>
</resources>
95 changes: 95 additions & 0 deletions android_app/app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">openScale</string>
<string name="title_users">ユーザー</string>
<string name="title_frag">早見表</string>
<string name="title_graph">図表</string>
<string name="title_new_data_entry">データ入力</string>
<string name="title_overview">概説</string>
<string name="label_yes">はい</string>
<string name="label_woman">女性</string>
<string name="label_user_name">高名</string>
<string name="label_time">時刻</string>
<string name="label_ok">OK</string>
<string name="label_no">いいえ</string>
<string name="label_id">Id</string>
<string name="label_fat">体脂肪率</string>
<string name="label_bmi">BMI</string>
<string name="label_bluetooth_title">Bluetooth</string>
<string name="label_birthday">誕生日</string>
<string name="label_title_statistics">統計</string>
<string name="label_weight">体重</string>
<string name="label_weight_difference">体重差</string>
<string name="action_settings">設定</string>
<string name="label_body_height">身長</string>
<string name="label_cancel">キャンセル</string>
<string name="label_comment">コメント</string>
<string name="label_days">日</string>
<string name="label_date">期日</string>
<string name="label_delete">デリート</string>
<string name="label_export">レコードのエクスポート</string>
<string name="label_import">レコードのインポート</string>
<string name="label_male">男性</string>
<string name="label_muscle">筋肉率</string>
<string name="label_gender">性別</string>
<string name="label_water">体内の水分</string>
<string name="label_title_user">ユーザー</string>
<string name="label_goal_weight">目標体重</string>
<string name="label_days_left">目標まで</string>
<string name="label_title_goal">目標</string>
<string name="label_goal_date">目標期日</string>
<string name="label_scale_unit">単位</string>
<string name="label_set">Set</string>
<string name="label_measures">計測</string>
<string name="label_title_last_measurement">最終の計測</string>
<string name="label_goal_date_is">目標期日は</string>
<string name="label_enable_muscle">筋肉率線</string>
<string name="label_enable_water">体内の水分線</string>
<string name="label_enable_weight">体重線</string>
<string name="label_enable_fat">体脂肪線</string>
<string name="label_delete_all">全てデリート</string>
<string name="label_bluetooth_enable">Bluetoothの体重計を探索する</string>
<string name="title_edit_data_entry">エディット</string>
<string name="label_last_month">過去30日</string>
<string name="label_last_week">過去7日</string>
<string name="label_device_name">デバイス名</string>
<string name="info_bluetooth_enable">有効にします</string>
<string name="info_bluetooth_disable">無効にします</string>
<string name="error_exporting">エクスポートに失敗しました</string>
<string name="error_importing">インポートに失敗しました</string>
<string name="error_body_height_required">身長が必要です</string>
<string name="error_fat_value_required">体脂肪率が必要です</string>
<string name="error_muscle_value_required">筋肉率が必要です</string>
<string name="error_user_name_required">ユーザー名が必要です</string>
<string name="error_value_range_0_100">値は0から100の間でなければなりません</string>
<string name="error_value_range_0_300">値は0から300の間でなければなりません</string>
<string name="error_water_value_required">体内の水分が必要です</string>
<string name="error_weight_value_required">体重が必要です</string>
<string name="info_bluetooth_not_established">Bluetooth接続を確立できなかった場合</string>
<string name="info_data_all_deleted">すべてのレコードが削除されます</string>
<string name="info_data_deleted">データベースが削除されます</string>
<string name="info_data_exported">データにエクスポート</string>
<string name="info_delete_bluetooth_data">すべてのBluetoothデータを削除します</string>
<string name="info_data_imported">データにインポート</string>
<string name="info_delete_bluetooth_data_success">Bluetoothのデータが正常に削除されました</string>
<string name="info_on_date">でした -</string>
<string name="info_no_selected_user">ユーザーは存在しません!設定で新しいユーザを入れてください</string>
<string name="label_add_user">ユーザーの追加する</string>
<string name="label_add">追加する</string>
<string name="info_your_fat">あなたは体脂肪率が</string>
<string name="info_your_muscle">あなたは筋肉率が</string>
<string name="info_your_water">あなたは体内の水分</string>
<string name="info_your_weight">あなたは体重</string>
<string name="info_set_filename">にファイル名を設定</string>
<string name="label_enable_labels">メモの上にデータ点</string>
<string name="info_is_visible">表示されています</string>
<string name="info_is_not_visible">表示されていません</string>
<string name="info_enter_user_name">あなたの名前を入力してください</string>
<string name="info_enter_goal_weight">あなたの体重をあなたの単位で入力してください</string>
<string name="info_enter_comment">任意でコメントを入力してください</string>
<string name="info_enter_value_cm">あなたの身長をcmで入力してください</string>
<string name="info_enter_value_percent">あなたの値を%で入力してください</string>
<string name="info_enter_value_unit">あなたの値を入力してください</string>
<string name="question_really_delete_all">あなたは本当にすべてのレコードを削除しますか</string>
<string name="question_really_delete_user">あなたが本当にユーザーを削除しますか</string>
</resources>
Loading

0 comments on commit 6aa50d7

Please sign in to comment.