TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New translations

Browse Source
This commit is contained in:
serso
2016-02-27 00:10:34 +01:00
parent b1b2a76be8
commit c602e552c7
27 changed files with 51 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/solovyev/android/calculator/DisplayFragment.java
View File

@@ -119,7 +119,7 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
if (!state.valid) {
return;
}
addMenu(menu, R.string.c_copy, this);
addMenu(menu, R.string.cpp_copy_text, this);
final Generic result = state.getResult();
final JsclOperation operation = state.getOperation();
@@ -185,7 +185,7 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
final DisplayState state = display.getState();
final Generic result = state.getResult();
switch (item.getItemId()) {
case R.string.c_copy:
case R.string.cpp_copy_text:
display.copy();
return true;
case R.string.convert_to_bin:

7
app/src/main/java/org/solovyev/android/calculator/FragmentTab.java
View File

@@ -42,7 +42,7 @@ public enum FragmentTab {
variables(VariablesFragment.class, R.string.c_vars),
functions(FunctionsFragment.class, R.string.c_functions),
operators(OperatorsFragment.class, R.string.c_operators),
about(AboutFragment.class, R.string.c_about),
about(AboutFragment.class, R.string.cpp_about),
// todo serso: strings
matrix_edit(EditMatrixFragment.class, R.string.c_release_notes),
@@ -60,9 +60,4 @@ public enum FragmentTab {
this.title = title;
this.tag = name();
}
@Nonnull
public String subTag(@Nonnull String subTag) {
return tag + "_" + subTag;
}
}

2
app/src/main/java/org/solovyev/android/calculator/converter/ConverterFragment.java
View File

@@ -124,7 +124,7 @@ public class ConverterFragment extends BaseDialogFragment
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setPositiveButton(R.string.c_use, null);
builder.setNegativeButton(R.string.cpp_cancel, null);
builder.setNeutralButton(R.string.c_copy, null);
builder.setNeutralButton(R.string.cpp_copy_text, null);
}
@Override

6
app/src/main/java/org/solovyev/android/calculator/plot/PlotActivity.java
View File

@@ -7,7 +7,8 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import butterknife.Bind;
import butterknife.ButterKnife;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseActivity;
import org.solovyev.android.calculator.BaseFragment;
@@ -19,9 +20,6 @@ import org.solovyev.android.plotter.Plotter;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife;
public class PlotActivity extends BaseActivity {
public static class MyFragment extends BaseFragment implements PlotViewFrame.Listener {

2
app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java
View File

@@ -36,7 +36,7 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
}
static {
preferences.append(R.xml.preferences, new PrefDef("screen-main", R.string.c_app_settings));
preferences.append(R.xml.preferences, new PrefDef("screen-main", R.string.cpp_settings));
preferences.append(R.xml.preferences_calculations, new PrefDef("screen-calculations", R.string.c_prefs_calculations_category));
preferences.append(R.xml.preferences_appearance, new PrefDef("screen-appearance", R.string.c_prefs_appearance_category));
preferences.append(R.xml.preferences_plot, new PrefDef("screen-plot", R.string.prefs_graph_screen_title));