PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: Fix partition repair message

Browse Source 
The message was named something non-existent.  Fix the spelling error
and add the default message into the language files.

Change-Id: I4e9e10d2705b1edf75b185d3badba59eb86ffb8b
This commit is contained in:
Greg Wallace
2015-12-29 14:19:21 -05:00
committed by Ethan Yonker
parent 4b44fef5ca
commit 2d65340c0f
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gui/devices/common/res/languages/en.xml
View File

@@ -118,6 +118,7 @@
<string name="flash_done">IMAGE FLASH COMPLETED]</string>
<string name="wiping">Wiping {1}</string>
<string name="repair_not_exist">{1} does not exist! Cannot repair!</string>
<string name="repairing_using">Repairing {1} using {2}...</string>
<string name="unable_repair">Unable to repair {1}.</string>
<string name="mount_data_footer">Could not mount /data and unable to find crypto footer.</string>
<!-- {1} is the folder name that we could not create, {2} is strerror output -->

1
gui/theme/common/languages/en.xml
View File

@@ -558,6 +558,7 @@
<string name="flash_done">[IMAGE FLASH COMPLETED]</string>
<string name="wiping">Wiping {1}</string>
<string name="repair_not_exist">{1} does not exist! Cannot repair!</string>
<string name="repairing_using">Repairing {1} using {2}...</string>
<string name="unable_repair">Unable to repair {1}.</string>
<string name="mount_data_footer">Could not mount /data and unable to find crypto footer.</string>
<!-- {1} is the folder name that we could not create, {2} is strerror output -->

10
partition.cpp
View File

@@ -1273,7 +1273,7 @@ bool TWPartition::Repair() {
}
if (!UnMount(true))
return false;
gui_msg(Msg("reparing=Repairing {1} using {2}...")(Display_Name)("fsck.fat"));
gui_msg(Msg("repairing_using=Repairing {1} using {2}...")(Display_Name)("fsck.fat"));
Find_Actual_Block_Device();
command = "/sbin/fsck.fat -y " + Actual_Block_Device;
LOGINFO("Repair command: %s\n", command.c_str());
@@ -1292,7 +1292,7 @@ bool TWPartition::Repair() {
}
if (!UnMount(true))
return false;
gui_msg(Msg("reparing=Repairing {1} using {2}...")(Display_Name)("e2fsck"));
gui_msg(Msg("repairing_using=Repairing {1} using {2}...")(Display_Name)("e2fsck"));
Find_Actual_Block_Device();
command = "/sbin/e2fsck -fp " + Actual_Block_Device;
LOGINFO("Repair command: %s\n", command.c_str());
@@ -1311,7 +1311,7 @@ bool TWPartition::Repair() {
}
if (!UnMount(true))
return false;
gui_msg(Msg("reparing=Repairing {1} using {2}...")(Display_Name)("fsck.exfat"));
gui_msg(Msg("repairing_using=Repairing {1} using {2}...")(Display_Name)("fsck.exfat"));
Find_Actual_Block_Device();
command = "/sbin/fsck.exfat " + Actual_Block_Device;
LOGINFO("Repair command: %s\n", command.c_str());
@@ -1330,7 +1330,7 @@ bool TWPartition::Repair() {
}
if (!UnMount(true))
return false;
gui_msg(Msg("reparing=Repairing {1} using {2}...")(Display_Name)("fsck.f2fs"));
gui_msg(Msg("repairing_using=Repairing {1} using {2}...")(Display_Name)("fsck.f2fs"));
Find_Actual_Block_Device();
command = "/sbin/fsck.f2fs " + Actual_Block_Device;
LOGINFO("Repair command: %s\n", command.c_str());
@@ -1354,7 +1354,7 @@ bool TWPartition::Repair() {
}
if (!UnMount(true))
return false;
gui_msg(Msg("reparing=Repairing {1} using {2}...")(Display_Name)(Ntfsfix_Binary));
gui_msg(Msg("repairing_using=Repairing {1} using {2}...")(Display_Name)(Ntfsfix_Binary));
Find_Actual_Block_Device();
command = "/sbin/" + Ntfsfix_Binary + " " + Actual_Block_Device;
LOGINFO("Repair command: %s\n", command.c_str());