Skip to content

Commit b424c51

Browse files
AcivevAcivev
committed
update using language-pack strings
1 parent 86fb5b2 commit b424c51

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎src/com/osudroid/ui/v2/CalibrationScene.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.edlplan.framework.easing.Easing
66
import com.osudroid.ui.v1.SettingsFragment
77
import com.osudroid.utils.mainThread
88
import com.osudroid.utils.updateThread
9+
import com.osudroid.resources.R.string
910
import com.reco1l.andengine.Anchor
1011
import com.reco1l.andengine.UIEngine
1112
import com.reco1l.andengine.UIScene
@@ -49,7 +50,6 @@ import ru.nsu.ccfit.zuev.osu.Config
4950
import ru.nsu.ccfit.zuev.osu.GlobalManager
5051
import ru.nsu.ccfit.zuev.osu.ResourceManager
5152
import ru.nsu.ccfit.zuev.osu.helper.StringTable
52-
import ru.nsu.ccfit.zuev.osuplus.R.string
5353

5454
object CalibrationScene : UIScene() {
5555
internal var OFFSET_MIN = -500

‎src/com/osudroid/ui/v2/multi/LobbyScene.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class LobbyScene : UIScene() {
109109
key = "search"
110110
width = 500f
111111
height = FillParent
112-
placeholder = StringTable.get(ru.nsu.ccfit.zuev.osuplus.R.string.multiplayer_lobby_search_rooms)
112+
placeholder = StringTable.get(string.multiplayer_lobby_search_rooms)
113113
}
114114

115115
override fun onValueChanged() {

‎src/com/osudroid/ui/v2/multi/RoomChat.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.osudroid.multiplayer.*
66
import com.osudroid.multiplayer.api.*
77
import com.osudroid.multiplayer.api.data.*
88
import com.osudroid.utils.*
9+
import com.osudroid.resources.R
910
import com.reco1l.andengine.*
1011
import com.reco1l.andengine.buffered.*
1112
import com.reco1l.andengine.component.*
@@ -20,7 +21,6 @@ import com.rian.andengine.modifier.ModifierType
2021
import org.anddev.andengine.input.touch.*
2122
import ru.nsu.ccfit.zuev.osu.*
2223
import ru.nsu.ccfit.zuev.osu.helper.StringTable
23-
import ru.nsu.ccfit.zuev.osuplus.R
2424
import java.util.LinkedList
2525

2626
/**

‎src/com/osudroid/ui/v2/multi/RoomPlayerCard.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.osudroid.ui.OsuColors
1111
import com.osudroid.ui.v2.*
1212
import com.osudroid.utils.async
1313
import com.osudroid.utils.updateThread
14+
import com.osudroid.resources.R
1415
import com.reco1l.andengine.*
1516
import com.reco1l.andengine.component.*
1617
import com.reco1l.andengine.container.*
@@ -33,7 +34,6 @@ import ru.nsu.ccfit.zuev.osu.ResourceManager
3334
import ru.nsu.ccfit.zuev.osu.helper.MD5Calculator
3435
import ru.nsu.ccfit.zuev.osu.helper.StringTable
3536
import ru.nsu.ccfit.zuev.osu.online.OnlineManager
36-
import ru.nsu.ccfit.zuev.osuplus.R
3737

3838
class RoomPlayerCard : UILinearContainer() {
3939
private val teamColorBar: UIButton

‎src/com/osudroid/ui/v2/multi/RoomScene.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.osudroid.ui.v2.modmenu.ModMenu
2525
import com.osudroid.utils.async
2626
import com.osudroid.utils.mainThread
2727
import com.osudroid.utils.updateThread
28+
import com.osudroid.resources.R
2829
import com.reco1l.andengine.Anchor
2930
import com.reco1l.andengine.Axes
3031
import com.reco1l.andengine.UIEngine
@@ -65,7 +66,6 @@ import ru.nsu.ccfit.zuev.osu.LibraryManager
6566
import ru.nsu.ccfit.zuev.osu.ResourceManager
6667
import ru.nsu.ccfit.zuev.osu.ToastLogger
6768
import ru.nsu.ccfit.zuev.osu.helper.StringTable
68-
import ru.nsu.ccfit.zuev.osuplus.R
6969

7070
class RoomScene(
7171
/**

‎src/ru/nsu/ccfit/zuev/osu/MainActivity.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.osudroid.BuildSettings;
4545
import com.osudroid.beatmaps.BeatmapCache;
4646
import com.osudroid.debug.DebugPlaygroundScene;
47+
import com.osudroid.resources.R;
4748
import com.osudroid.ui.FPSCounter;
4849
import com.osudroid.ui.v2.GameLoaderScene;
4950
import com.osudroid.utils.Execution;
@@ -97,7 +98,6 @@
9798
import ru.nsu.ccfit.zuev.osu.menu.SplashScene;
9899
import ru.nsu.ccfit.zuev.osu.online.OnlineManager;
99100
import ru.nsu.ccfit.zuev.osuplus.BuildConfig;
100-
import ru.nsu.ccfit.zuev.osuplus.R;
101101

102102
public class MainActivity extends BaseGameActivity implements
103103
IAccelerometerListener {
@@ -189,7 +189,7 @@ null, new RatioResolutionPolicy(
189189

190190
if (!MultiTouch.isSupported(this)) {
191191
// Warning player that they will have to single tap forever.
192-
ToastLogger.showText(StringTable.get(com.osudroid.resources.R.string.message_info_multitouch), false);
192+
ToastLogger.showText(StringTable.get(R.string.message_info_multitouch), false);
193193
}
194194
engine.setTouchController(new MultiTouchController());
195195

@@ -207,7 +207,7 @@ private void initialGameDirectory() {
207207
dir = new File(Config.getBeatmapPath());
208208
if (!(dir.exists() || dir.mkdirs())) {
209209
ToastLogger.showText(StringTable.format(
210-
com.osudroid.resources.R.string.message_error_createdir, dir.getPath()),
210+
R.string.message_error_createdir, dir.getPath()),
211211
true);
212212
} else {
213213
final SharedPreferences prefs = PreferenceManager
@@ -386,7 +386,7 @@ private void availableInternalMemory() {
386386
File internal = Environment.getDataDirectory();
387387
StatFs stat = new StatFs(internal.getPath());
388388
availableMemory = (double) stat.getAvailableBytes();
389-
String toastMessage = String.format(StringTable.get(com.osudroid.resources.R.string.message_low_storage_space), df.format(availableMemory / minMem));
389+
String toastMessage = String.format(StringTable.get(R.string.message_low_storage_space), df.format(availableMemory / minMem));
390390
if (availableMemory < 0.5 * minMem) { //I set 512MiB as a minimum
391391
Execution.mainThread(() -> Toast.makeText(this, toastMessage, Toast.LENGTH_LONG).show());
392392
}
@@ -431,7 +431,7 @@ public void loadBeatmapLibrary() {
431431
File file = new File(fileToAdd);
432432
if (file.getName().toLowerCase().endsWith(".osz")) {
433433
ToastLogger.showText(
434-
StringTable.get(com.osudroid.resources.R.string.library_importing),
434+
StringTable.get(R.string.library_importing),
435435
false);
436436

437437
FileUtils.extractBeatmapset(fileToAdd, Config.getBeatmapPath());
@@ -497,7 +497,7 @@ public void loadBeatmapLibrary() {
497497
// final boolean deleteOsz = Config.isDELETE_OSZ();
498498
// Config.setDELETE_OSZ(true);
499499
ToastLogger.showText(StringTable.format(
500-
com.osudroid.resources.R.string.library_importing_several,
500+
R.string.library_importing_several,
501501
beatmaps.size()), false);
502502
for (final String beatmap : beatmaps) {
503503
FileUtils.extractBeatmapset(beatmap, Config.getBeatmapPath());
@@ -553,15 +553,15 @@ public void checkNewSkins() {
553553

554554
if (skins.size() > 0) {
555555
ToastLogger.showText(StringTable.format(
556-
com.osudroid.resources.R.string.library_skin_importing_several,
556+
R.string.library_skin_importing_several,
557557
skins.size()), false);
558558

559559
for (final String skin : skins) {
560560
if (FileUtils.extractZip(skin, Config.getSkinTopPath())) {
561561
String folderName = skin.substring(0, skin.length() - 4);
562562
// We have imported the skin!
563563
ToastLogger.showText(
564-
StringTable.format(com.osudroid.resources.R.string.library_imported, folderName),
564+
StringTable.format(R.string.library_imported, folderName),
565565
true);
566566
Config.addSkin(folderName.substring(folderName.lastIndexOf("/") + 1), skin);
567567
}
@@ -1121,7 +1121,7 @@ private boolean checkPermissions() {
11211121
} else {
11221122
Intent grantPermission = new Intent(this, PermissionActivity.class);
11231123
startActivity(grantPermission);
1124-
overridePendingTransition(R.anim.fast_activity_swap, R.anim.fast_activity_swap);
1124+
overridePendingTransition(ru.nsu.ccfit.zuev.osuplus.R.anim.fast_activity_swap, ru.nsu.ccfit.zuev.osuplus.R.anim.fast_activity_swap);
11251125
finish();
11261126
return false;
11271127
}
@@ -1133,7 +1133,7 @@ private void showMultiModeWindowAlert() {
11331133
.setTitle(getString(R.string.multi_mode_window_alert_title))
11341134
.setMessage(getString(R.string.multi_mode_window_alert_message))
11351135
.setAllowDismiss(false)
1136-
.addButton(getString(com.osudroid.resources.R.string.accessibility_detector_exit), (d) -> {
1136+
.addButton(getString(R.string.accessibility_detector_exit), (d) -> {
11371137
finish();
11381138
return null;
11391139
});

0 commit comments

Comments
 (0)