Merge branch '407-create-initial-parser-to-load-level-2-json'

#Conflicts: # Photo Club Hub.xcodeproj/project.pbxproj
vdhamer · Aug 5, 2024 · ca3d871 · ca3d871
2 parents 2bcf785 + 811781e
commit ca3d871
Show file tree

Hide file tree

Showing 59 changed files with 1,520 additions and 1,310 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -651,7 +651,7 @@ Here is an example of the format of a `Level 2` list for a photo club. This exam
                     "isMentor": false,
                     "isPropectiveMember": false
                 },
-                "birthday": "9999-10-18T00:00:00.000Z",
+                "birthday": "9999-10-18",
                 "website": "https://glass.photo/vdhamer",
                 "featuredImage": "http://www.vdhamer.com/wp-content/uploads/2023/11/PeterVanDenHamer.jpg",
                 "level3URL": "https://www.example.com/FG_deGender/Peter_van_den_Hamer.level3.json"

diff --git a/Localization/Photo Club Hub Localizations/en.xcloc/Localized Contents/en.xliff b/Localization/Photo Club Hub Localizations/en.xcloc/Localized Contents/en.xliff
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Photo-Club-Hub-InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5202i"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5211f"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -24,7 +24,7 @@
   </file>
   <file original="Localization/en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5202i"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5211f"/>
     </header>
     <body>
       <trans-unit id="%lld members (inc. ex-members)" xml:space="preserve">
@@ -87,11 +87,6 @@
         <target>App version %@ (build %@)</target>
         <note>Shown on Readme page.</note>
       </trans-unit>
-      <trans-unit id="Apple" xml:space="preserve">
-        <source>Apple</source>
-        <target>Apple</target>
-        <note>Name of the fruit, not the company.</note>
-      </trans-unit>
       <trans-unit id="Birthday" xml:space="preserve">
         <source>Birthday</source>
         <target>Birthday</target>
@@ -112,6 +107,13 @@
         <target>Clubs and Museums</target>
         <note>Title of page with maps for Clubs and Museums</note>
       </trans-unit>
+      <trans-unit id="Clubs, their Members, and their Portfolios&#10;" xml:space="preserve">
+        <source>Clubs, their Members, and their Portfolios
+</source>
+        <target>Clubs, their Members, and their Portfolios
+</target>
+        <note>Caption of an image on the Readme page</note>
+      </trans-unit>
       <trans-unit id="Concept" xml:space="preserve">
         <source>The concept</source>
         <target>The concept</target>
@@ -202,7 +204,7 @@ Try dragging down the Clubs and Museums screen to reload the default clubs.</tar
       <trans-unit id="Options in Settings" xml:space="preserve">
         <source>Options in Settings</source>
         <target>Options in Settings</target>
-        <note>No comment provided by engineer.</note>
+        <note>Link to Photo Club Hub section in Settings</note>
       </trans-unit>
       <trans-unit id="Paragraph_1.1" xml:space="preserve">
         <source>Our ambitions in creating _Photo Club Hub_ were to strengthen ties between photography clubs, and making the work of club members easier to access.</source>
@@ -501,13 +503,6 @@ Try dragging down the Clubs and Museums screen to reload the default clubs.</tar
         <target>Portfolios</target>
         <note>Title of page showing member portfolios</note>
       </trans-unit>
-      <trans-unit id="Poster for a photo club exposition&#10;" xml:space="preserve">
-        <source>Poster for a photo club exposition
-</source>
-        <target>Poster for a photo club exposition
-</target>
-        <note>Caption of an image on the Readme page</note>
-      </trans-unit>
       <trans-unit id="Preferences" xml:space="preserve">
         <source>Preferences</source>
         <target>Preferences</target>
@@ -762,7 +757,7 @@ Try dragging down the Clubs and Museums screen to reload the default clubs.</tar
   </file>
   <file original="Settings.bundle/en.lproj/Root.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5202i"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5211f"/>
     </header>
     <body>
       <trans-unit id="Debug options" xml:space="preserve">

diff --git a/...Club Hub Localizations/en.xcloc/Source Contents/Localization/en.lproj/Localizable.strings b/...Club Hub Localizations/en.xcloc/Source Contents/Localization/en.lproj/Localizable.strings
@@ -31,6 +31,9 @@
 /* Header of section of Who's Who screen */
 "1 photographer (of %lld)" = "1 photographer (of %lld)";
 
+/* In Preferences, above link to Settings */
+"Advanced" = "Advanced";
+
 /* Administrative role of member within a club. Used as part of concatenations. */
 "admin" = "admin";
 
@@ -43,9 +46,6 @@
 /* Shown on Readme page. */
 "App version %@ (build %@)" = "App version %@ (build %@)";
 
-/* Name of the fruit, not the company. */
-"Apple" = "Apple";
-
 /* Birthday of member (without year). Date not currently localized? */
 "Birthday" = "Birthday";
 
@@ -61,6 +61,9 @@
 /* Title of page with maps for Clubs and Museums */
 "Clubs and Museums" = "Clubs and Museums";
 
+/* Caption of an image on the Readme page */
+"Clubs, their Members, and their Portfolios\n" = "Clubs, their Members, and their Portfolios\n";
+
 /* Section title on Readme page */
 "Concept" = "The concept";
 
@@ -142,6 +145,9 @@
 /* Section title on Readme page */
 "Open Source" = "Developers";
 
+/* Link to Photo Club Hub section in Settings */
+"Options in Settings" = "Options in Settings";
+
 /* First paragraph in The App section of Readme page */
 "Paragraph_1.1" = "Our ambitions in creating _Photo Club Hub_ were to strengthen ties between photography clubs, and making the work of club members easier to access.";
 
@@ -319,9 +325,6 @@
 /* Title of page showing member portfolios */
 "Portfolios" = "Portfolios";
 
-/* Caption of an image on the Readme page */
-"Poster for a photo club exposition\n" = "Poster for a photo club exposition\n";
-
 /* Title of screen with toggles to adjust preferences */
 "Preferences" = "Preferences";
 

diff --git a/Localization/Photo Club Hub Localizations/en.xcloc/contents.json b/Localization/Photo Club Hub Localizations/en.xcloc/contents.json
@@ -3,7 +3,7 @@
   "project" : "Photo Club Hub.xcodeproj",
   "targetLocale" : "en",
   "toolInfo" : {
-    "toolBuildNumber" : "16A5202i",
+    "toolBuildNumber" : "16A5211f",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
     "toolVersion" : "16.0"

diff --git a/Localization/Photo Club Hub Localizations/nl.xcloc/Localized Contents/nl.xliff b/Localization/Photo Club Hub Localizations/nl.xcloc/Localized Contents/nl.xliff
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Photo-Club-Hub-InfoPlist.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5202i"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5211f"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -24,7 +24,7 @@
   </file>
   <file original="Localization/en.lproj/Localizable.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5202i"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5211f"/>
     </header>
     <body>
       <trans-unit id="%lld members (inc. ex-members)" xml:space="preserve">
@@ -74,7 +74,7 @@
       </trans-unit>
       <trans-unit id="Advanced" xml:space="preserve">
         <source>Advanced</source>
-        <target state="translated">Technische instellingen</target>
+        <target>Technische instellingen</target>
         <note>In Preferences, above link to Settings</note>
       </trans-unit>
       <trans-unit id="Amsterdam has two photography museums." xml:space="preserve">
@@ -87,11 +87,6 @@
         <target>App versie %@ (build %@)</target>
         <note>Shown on Readme page.</note>
       </trans-unit>
-      <trans-unit id="Apple" xml:space="preserve">
-        <source>Apple</source>
-        <target>Appel</target>
-        <note>Name of the fruit, not the company.</note>
-      </trans-unit>
       <trans-unit id="Birthday" xml:space="preserve">
         <source>Birthday</source>
         <target>Verjaardag</target>
@@ -112,6 +107,13 @@
         <target>Clubs en Musea</target>
         <note>Title of page with maps for Clubs and Museums</note>
       </trans-unit>
+      <trans-unit id="Clubs, their Members, and their Portfolios&#10;" xml:space="preserve">
+        <source>Clubs, their Members, and their Portfolios
+</source>
+        <target>Clubs, hun Leden en hun Portfolio's
+</target>
+        <note>Caption of an image on the Readme page</note>
+      </trans-unit>
       <trans-unit id="Concept" xml:space="preserve">
         <source>The concept</source>
         <target>Het concept</target>
@@ -201,8 +203,8 @@ Door dit Fotogroepen scherm omlaag te slepen en los te laten worden enkele voorb
       </trans-unit>
       <trans-unit id="Options in Settings" xml:space="preserve">
         <source>Options in Settings</source>
-        <target state="translated">Opties bij Instellingen</target>
-        <note>No comment provided by engineer.</note>
+        <target>Opties bij Instellingen</target>
+        <note>Link to Photo Club Hub section in Settings</note>
       </trans-unit>
       <trans-unit id="Paragraph_1.1" xml:space="preserve">
         <source>Our ambitions in creating _Photo Club Hub_ were to strengthen ties between photography clubs, and making the work of club members easier to access.</source>
@@ -500,13 +502,6 @@ Door dit Fotogroepen scherm omlaag te slepen en los te laten worden enkele voorb
         <target>Portfolio's</target>
         <note>Title of page showing member portfolios</note>
       </trans-unit>
-      <trans-unit id="Poster for a photo club exposition&#10;" xml:space="preserve">
-        <source>Poster for a photo club exposition
-</source>
-        <target>Poster voor een club expositie
-</target>
-        <note>Caption of an image on the Readme page</note>
-      </trans-unit>
       <trans-unit id="Preferences" xml:space="preserve">
         <source>Preferences</source>
         <target>Instellingen</target>
@@ -639,7 +634,7 @@ Door dit Fotogroepen scherm omlaag te slepen en los te laten worden enkele voorb
       </trans-unit>
       <trans-unit id="WhosWho_Caption_3" xml:space="preserve">
         <source>③ The thumbnails can be scrolled horizontally.</source>
-        <target>③ De miniatuurfoto's kunnen horizontaal verschoven worden.</target>
+        <target>③ De miniatuurfoto's kunnen horizontaal versleept worden, al zal dat zelden nodig zijn.</target>
         <note>Shown in gray at the bottom of the Who's Who page (3/3).</note>
       </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
@@ -761,7 +756,7 @@ Door dit Fotogroepen scherm omlaag te slepen en los te laten worden enkele voorb
   </file>
   <file original="Settings.bundle/en.lproj/Root.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5202i"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.0" build-num="16A5211f"/>
     </header>
     <body>
       <trans-unit id="Debug options" xml:space="preserve">

diff --git a/...Club Hub Localizations/nl.xcloc/Source Contents/Localization/en.lproj/Localizable.strings b/...Club Hub Localizations/nl.xcloc/Source Contents/Localization/en.lproj/Localizable.strings
@@ -31,6 +31,9 @@
 /* Header of section of Who's Who screen */
 "1 photographer (of %lld)" = "1 photographer (of %lld)";
 
+/* In Preferences, above link to Settings */
+"Advanced" = "Advanced";
+
 /* Administrative role of member within a club. Used as part of concatenations. */
 "admin" = "admin";
 
@@ -43,9 +46,6 @@
 /* Shown on Readme page. */
 "App version %@ (build %@)" = "App version %@ (build %@)";
 
-/* Name of the fruit, not the company. */
-"Apple" = "Apple";
-
 /* Birthday of member (without year). Date not currently localized? */
 "Birthday" = "Birthday";
 
@@ -61,6 +61,9 @@
 /* Title of page with maps for Clubs and Museums */
 "Clubs and Museums" = "Clubs and Museums";
 
+/* Caption of an image on the Readme page */
+"Clubs, their Members, and their Portfolios\n" = "Clubs, their Members, and their Portfolios\n";
+
 /* Section title on Readme page */
 "Concept" = "The concept";
 
@@ -142,6 +145,9 @@
 /* Section title on Readme page */
 "Open Source" = "Developers";
 
+/* Link to Photo Club Hub section in Settings */
+"Options in Settings" = "Options in Settings";
+
 /* First paragraph in The App section of Readme page */
 "Paragraph_1.1" = "Our ambitions in creating _Photo Club Hub_ were to strengthen ties between photography clubs, and making the work of club members easier to access.";
 
@@ -319,9 +325,6 @@
 /* Title of page showing member portfolios */
 "Portfolios" = "Portfolios";
 
-/* Caption of an image on the Readme page */
-"Poster for a photo club exposition\n" = "Poster for a photo club exposition\n";
-
 /* Title of screen with toggles to adjust preferences */
 "Preferences" = "Preferences";
 

diff --git a/Localization/Photo Club Hub Localizations/nl.xcloc/contents.json b/Localization/Photo Club Hub Localizations/nl.xcloc/contents.json
@@ -3,7 +3,7 @@
   "project" : "Photo Club Hub.xcodeproj",
   "targetLocale" : "nl",
   "toolInfo" : {
-    "toolBuildNumber" : "16A5202i",
+    "toolBuildNumber" : "16A5211f",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
     "toolVersion" : "16.0"

diff --git a/Localization/nl.lproj/Localizable.strings b/Localization/nl.lproj/Localizable.strings
@@ -431,5 +431,5 @@
 "WhosWho_Caption_2" = "② Per fotograaf zijn er meestal één of twee miniatuurfoto's. Klik op een foto om een portfolio te bekijken.";
 
 /* Shown in gray at the bottom of the Who's Who page (3/3). */
-"WhosWho_Caption_3" = "③ De miniatuurfoto's kunnen horizontaal verschoven worden.";
+"WhosWho_Caption_3" = "③ De miniatuurfoto's kunnen horizontaal versleept worden, al zal dat zelden nodig zijn.";