Finalised language strings

app/src/main/java/com/yorksj/museumapp/LoginPage.java

@@ -46,13 +46,13 @@ public class LoginPage extends AppCompatActivity
                 System.out.println("Login result: " + result);
                 if (result)
                 {
-                    Toast.makeText(LoginPage.this, "Login successful.", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(LoginPage.this, getString(R.string.loginSuccess), Toast.LENGTH_SHORT).show();
                     LoginManager.getInstance().setActiveUser(user);
                     startActivity(new Intent(LoginPage.this, MuseumList.class));
                 }
                 else
                 {
-                    Toast.makeText(LoginPage.this, "Invalid username/password", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(LoginPage.this, getString(R.string.invalidUsername), Toast.LENGTH_SHORT).show();
                 }
             }
         });

app/src/main/java/com/yorksj/museumapp/MuseumPage.java

@@ -13,6 +13,9 @@ import android.widget.TextView;
 import com.yorksj.museumapp.home.HomeButton;
 import com.yorksj.museumapp.museums.MuseumPacket;
 
+import java.text.NumberFormat;
+import java.util.Locale;
+
 public class MuseumPage extends AppCompatActivity
 {
 
@@ -46,7 +49,9 @@ public class MuseumPage extends AppCompatActivity
         ImageView image = findViewById(R.id.museumImage);
         TextView price = findViewById(R.id.museumPrice);
 
-        String priceString = "£" + packet.entranceFee + ".00";
+        Locale locale = getResources().getConfiguration().getLocales().get(0);
+
+        String priceString = NumberFormat.getCurrencyInstance(locale).format(packet.entranceFee);
 
         name.setText(packet.name);
         description.setText(packet.enhancedDescription);

app/src/main/res/layout/activity_book_confirmation.xml

@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:text="@string/bookingCode"
+        android:text="@string/bookingCodeID"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"

app/src/main/res/layout/activity_museum_list.xml

@@ -18,7 +18,7 @@
         android:id="@+id/textView"
         android:layout_width="fill_parent"
         android:layout_height="24dp"
-        android:text="Museum List"
+        android:text="@string/museumList"
         android:textAlignment="center"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -28,7 +28,7 @@
         android:id="@+id/textView6"
         android:layout_width="fill_parent"
         android:layout_height="24dp"
-        android:text="Please select the museum you wish to visit"
+        android:text="@string/museumListVisit"
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"

app/src/main/res/layout/activity_museum_page.xml

@@ -45,7 +45,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:text="Book"
+        android:text="@string/book"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.949"
@@ -66,7 +66,7 @@
         android:id="@+id/textView4"
         android:layout_width="84dp"
         android:layout_height="23dp"
-        android:text="Cost"
+        android:text="@string/cost"
         android:textAlignment="textEnd"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/museumPrice"

app/src/main/res/values/strings.xml

@@ -47,7 +47,7 @@
     <string name="cafeOrderText">Select the items you want to preorder</string>
     <string name="cont">Continue</string>
     <string name="thankYou">Thank you for your order</string>
-    <string name="bookingCode">Your booking code is</string>
+    <string name="bookingCodeID">Your booking code is</string>
     <string name="goingTo">You are going to</string>
     <string name="on">on</string>
     <string name="totalCost">Total Cost</string>
@@ -84,6 +84,9 @@
     <string name="chars">must be at least 5 characters.</string>
     <string name="registerSuccess">Successfully registered.</string>
     <string name="registerFailed">Registration failed.</string>
+    <string name="museumList">Museum List</string>
+    <string name="museumListVisit">Please select the museum you wish to visit</string>
+    <string name="book">Book</string>
     
     <string-array name="book_times">
         <item>9am-11am</item>