From 1f8eb730871fb67d1ee19a51ae47da4cece7c8be Mon Sep 17 00:00:00 2001 From: Guy Khmelnitsky <3136012+GuyKh@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:30:11 +0200 Subject: [PATCH] Revert "Fix check" --- LICENSE.txt | 373 -------- _locales/en/messages.json | 1535 ++++++++++++++----------------- _locales/fr/messages.json | 850 ----------------- background.js | 159 +--- buildform.js | 466 ++++------ collections/familysearchjson.js | 760 +++++---------- collections/findagrave.js | 33 +- collections/geneanet.js | 234 +---- collections/wikitree.js | 11 +- manifest.json | 3 +- parse-names.js | 41 +- popup.html | 31 +- popup.js | 386 ++++---- research.js | 4 +- 14 files changed, 1369 insertions(+), 3517 deletions(-) delete mode 100644 LICENSE.txt delete mode 100644 _locales/fr/messages.json diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index a612ad9..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 684f565..724d2b4 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1,850 +1,685 @@ -{ - "appName": { - "message": "SmartCopy" - }, - "appShortName": { - "message": "SmartCopy" - }, - "appDesc": { - "message": "Tool for copying genealogical data into Geni." - }, - "consistencyCheck": { - "message": "Consistency Check" - }, - "contains_incorrect_uppercase_lowercase_in_name": { - "message": "$person$ contains incorrect use of uppercase/lowercase in $pronoun$ name ($lang$).", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - }, - "lang": { - "content": "$3" - } - } - }, - "contains_incorrect_uppercase_lowercase_in_name_default": { - "message": "$person$ contains incorrect use of uppercase/lowercase in $pronoun$ name.", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - } - } - }, - "contains_patronym_in_first_name": { - "message": "$person$ contains a patro/matronym in $pronoun$ first name ($lang$).", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - }, - "lang": { - "content": "$3" - } - } - }, - "contains_patronym_in_first_name_default": { - "message": "$person$ contains a patro/matronym in $pronoun$ first name.", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - } - } - }, - "contains_non_patronym_in_middle_name": { - "message": "$person$ contains a non-patro/matronym in $pronoun$ middle name ($lang$).", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - }, - "lang": { - "content": "$3" - } - } - }, - "contains_non_patronym_in_middle_name_default": { - "message": "$person$ contains a non-patro/matronym in $pronoun$ middle name.", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - } - } - }, - "living": { - "message": "living" - }, - "claimed": { - "message": "claimed" - }, - "fixCase": { - "message": "fix case" - }, - "fixed": { - "message": "fixed" - }, - "fixName": { - "message": "fix name" - }, - "fixSpace": { - "message": "fix space" - }, - "fixSuffix": { - "message": "fix suffix" - }, - "fixTitle": { - "message": "fix title" - }, - "makePublic": { - "message": "make public" - }, - "numFamilyMembersBornBeforeYearAreSetAsPrivate": { - "message": "$count$ family members born before c.$year$ are set as private.", - "placeholders": { - "count": { - "content": "$1" - }, - "year": { - "content": "$2" - } - } - }, - "personWasBornBeforeYearAndIsSetAsPrivate": { - "message": "$person$ was born before c.$year$ and is set as private.", - "placeholders": { - "person": { - "content": "$1" - }, - "year": { - "content": "$2" - } - } - }, - "Research_this_Person": { - "message": "Research this Person" - }, - "All_Collections": { - "message": "All Collections" - }, - "Collections": { - "message": "Collections" - }, - "Publications": { - "message": "Publications" - }, - "Holocaust": { - "message": "Holocaust" - }, - "Name_Search": { - "message": "Name Search" - }, - "Gravestones": { - "message": "Gravestones" - }, - "Genealogies": { - "message": "Genealogies" - }, - "Genealogy": { - "message": "Genealogy" - }, - "Geni_Search": { - "message": "Geni Search" - }, - "Google_Search": { - "message": "Google Search" - }, - "Records": { - "message": "Records" - }, - "Messageboard": { - "message": "Messageboard" - }, - "Newspapers": { - "message": "Newspapers" - }, - "Books": { - "message": "Books" - }, - "Obituaries": { - "message": "Obituaries" - }, - "Other_Resources": { - "message": "Other Resources" - }, - "Unable_to_create_research_links_on_this_profile": { - "message": "Unable to create research links on this profile." - }, - "Loading___": { - "message": "Loading..." - }, - "Ancestor_Graph": { - "message": "Ancestor Graph" - }, - "Descendant_Graph": { - "message": "Descendant Graph" - }, - "History_Search": { - "message": "History Search" - }, - "Configuration": { - "message": "Configuration" - }, - "Copy_Preferences": { - "message": "Copy Preferences" - }, - "Consistency_Checks": { - "message": "Consistency Checks" - }, - "Geni_Customization": { - "message": "Geni Customization" - }, - "Note_Dates_that_contain_Between_Before_and_After___": { - "message": "Note: Dates that contain Between, Before, and After are not compared in consistency checks. Dates with Circa are considered as exact dates." - }, - "Run_consistency_checks_when_viewing_Geni_profiles": { - "message": "Run consistency checks when viewing Geni profiles." - }, - "Age_difference_between_partners_is_significant": { - "message": "Age difference between partners is significant" - }, - "Maiden_name_same_as_husbands_last_name": { - "message": "Maiden name same as husband's last name" - }, - "Husband_and_wife_death_dates_the_same": { - "message": "Husband and wife death dates the same" - }, - "Husband_death_date_same_as_marriage_date": { - "message": "Husband death date same as marriage date" - }, - "Wife_death_date_same_as_marriage_date": { - "message": "Wife death date same as marriage date" - }, - "Born_after_marriage": { - "message": "Born after marriage" - }, - "Died_before_marriage": { - "message": "Died before marriage" - }, - "Implausible_marriage_age_too_young": { - "message": "Implausible marriage age, too young" - }, - "Siblings_ages_too_close_together": { - "message": "Siblings ages too close together" - }, - "Born_before_parent_birth": { - "message": "Born before parent birth" - }, - "Born_after_parent_death": { - "message": "Born after parent death" - }, - "Death_before_baptism_date": { - "message": "Death before baptism date" - }, - "Death_after_burial_date": { - "message": "Death after burial date" - }, - "Parent_too_young_for_childs_birth": { - "message": "Parent too young for child's birth" - }, - "Mother_too_old_for_childs_birth": { - "message": "Mother too old for child's birth" - }, - "Born_before_parent_marriage": { - "message": "Born before parent marriage" - }, - "Excessive_Age": { - "message": "Excessive Age" - }, - "Born_after_death": { - "message": "Born after death" - }, - "Name_contains_double_space": { - "message": "Name contains double space" - }, - "Name_contains_alias": { - "message": "Name contains alias" - }, - "Name_contains_improper_use_of_uppercase_lowercase": { - "message": "Name contains improper use of uppercase/lowercase" - }, - "First_Name_ends_in_suffix_eg___": { - "message": "First Name ends in suffix (eg. 'i','ii','iii','iv','jr','sr')" - }, - "Salutation_or_relationship_in_title_eg___": { - "message": "Salutation or relationship in title (eg. 'Mr', 'Mrs')" - }, - "Salutation_or_relationship_in_suffix_eg___": { - "message": "Salutation or relationship in suffix (eg. 'Mr', 'Mrs')" - }, - "Relationship_cycle_in_immediate_family": { - "message": "Relationship cycle in immediate family" - }, - "Check_date_formatting_for_inconsistent_values": { - "message": "Check date formatting for inconsistent values" - }, - "Check_for_pending_data_conflict_resolution": { - "message": "Check for pending data conflict resolution" - }, - "Self_check_profile_for_inconsistent_dates_and_values": { - "message": "Self-check profile for inconsistent dates and values." - }, - "Check_name_fields_for_improper_values": { - "message": "Check name fields for improper values" - }, - "Check_name_fields_for_living_profiles": { - "message": "Exclude living profiles from quick fix" - }, - "Check_profile_for_pending_data_conflicts": { - "message": "Check profile for pending data conflicts" - }, - "Check_date_values_for_irregular_formatting": { - "message": "Check date values for irregular formatting" - }, - "Check_when_location_is_missing_a_country": { - "message": "Check when location is missing a country" - }, - "Maximum_year_to_be_private": { - "message": "Maximum year to be private:" - }, - "Maximum_age": { - "message": "Maximum age:" - }, - "Check_the_dates_of_children_against_their_parents": { - "message": "Check the dates of children against their parents." - }, - "Check_child_is_born_after_parent_marriage": { - "message": "Check child is born after parent marriage" - }, - "Age_the_parent_is_too_young_to_have_a_child": { - "message": "Age the parent is too young to have a child" - }, - "Age_the_mother_is_too_old_to_have_a_child": { - "message": "Age the mother is too old to have a child" - }, - "Check_the_values_of_partner_spouses_against_each_other": { - "message": "Check the values of partner/spouses against each other." - }, - "Identify_possible_maiden_name_copy_issues": { - "message": "Identify possible maiden name copy issues" - }, - "Age_the_spouse_is_too_young_to_be_married": { - "message": "Age the spouse is too young to be married" - }, - "Maximum_age_difference_between_spouses": { - "message": "Maximum age difference between spouses" - }, - "Check_siblings_birth_are_over_": { - "message": "Check siblings birth are over " - }, - "_months_apart_excl_twins": { - "message": " months apart (excl. twins)." - }, - "Future_options_to_add_features_to_Geni": { - "message": "Future options to add features to Geni." - }, - "This_profile_is_not_in_the_World_Family_Tree": { - "message": "This profile is not in the World Family Tree." - }, - "Add_to_History": { - "message": "Add to History" - }, - "Show_History": { - "message": "Show History" - }, - "Hide_History": { - "message": "Hide History" - }, - "Clear_History": { - "message": "Clear History" - }, - "Notice___Please_Read": { - "message": "Notice - Please Read" - }, - "SmartCopy_will_no_longer_do_geo_location_lookups___": { - "message": "SmartCopy will no longer automatically do geo-location lookups due to the cost of Google's service. While this is sad news, Geni has recently provided the feature of doing geolocation lookups after submission. When a location is submitted via the place field, Geni will do the query and populate the location fields on the website. Alternatively, you can specify your own Google API key in the configuration. You also still have the option to manually fill out the location data in SmartCopy by clicking the globe icon $globe_icon$ and if you want to disable Geni's geolocation lookup, you can do so in the SmartCopy configuration.", - "placeholders": { - "globe_icon": { - "content": "$1" - } - } - }, - "Close": { - "message": "Close" - }, - "Display_Add_Biography_button_in_About": { - "message": "Display Add Biography button in About" - }, - "Add_Biography": { - "message": "Add biography" - }, - "Export_Profiles_button_on_Project_Actions": { - "message": "Export Profiles button on Project Actions" - }, - "Export_Profiles": { - "message": "Export Profiles" - }, - - - "SmartCopy_does_not_currently_support_parsing": { - "message": "SmartCopy does not currently support parsing this page / site / collection." - }, - "SmartCopy_is_having_difficulty_reading_the_page": { - "message": "SmartCopy is having difficulty reading the page. Try refreshing the page." - }, - "This_website_is_not_yet_supported_by_SmartCopy": { - "message": "This website is not yet supported by SmartCopy." - }, - - "Selection": { - "message": "Selection" - }, - "Simplify_form_by_hiding_unused_fields": { - "message": "Simplify form by hiding unused fields" - }, - "Enable_photo_checkbox_auto_selection": { - "message": "Enable photo checkbox auto-selection" - }, - "Reminder_user_responsible": { - "message": "Reminder: The user is responsible for
obtaining any required permission from
the photographer when copying images." - }, - "Exclude_private_profile_auto_select": { - "message": "Exclude profile auto-select" - }, - "Est_burial_date_from_death_if_location": { - "message": "Est. burial date from death if location" - }, - "This_change_will_take_effect_at_next_use": { - "message": "This change will take effect at next use." - }, - "Location": { - "message": "Location" - }, - "Enable_Geolocation": { - "message": "Enable Geolocation" - }, - "API_Key": { - "message": "API Key" - }, - "Location_fields_auto_select_one_select_all": { - "message": "Location fields select one select all" - }, - "Naming": { - "message": "Naming" - }, - "Auto_populate_empty_birth_name_fields": { - "message": "Auto populate empty birth name fields" - }, - "Parse_for_middle_names_automatically": { - "message": "Parse for middle names automatically" - }, - "Auto_adjust_the_names_for_mixed_case": { - "message": "Auto-adjust the names for mixed-case" - }, - "Force_compound_lastname_to_lowercase": { - "message": "Force compound lastname to lowercase" - }, - "Default_children_to_likely_Geni_parent": { - "message": "Default children to likely Geni parent" - }, - "Default_deceased_profiles_to_public": { - "message": "Default deceased profiles to public" - }, - "Add_reference_to_Geni_s_About_section": { - "message": "Add reference to Geni's About section" - }, - "Display_the_Geni_side_data_by_default": { - "message": "Display the Geni side data by default" - }, - - "Please_select_one_of_the_Matches": { - "message": "Please select one of the Matches on this results page." - }, - - "_year_age_difference_between_": { - "message": " year age difference between " - }, - "Birth_Surname_of_": { - "message": "Birth Surname of " - }, - "_is_the_same_as_the_last_name_of_": { - "message": " is the same as the last name of " - }, - "Death_date_of_": { - "message": "Death date of " - }, - "_is_the_same_as_the_death_date_of_": { - "message": " is the same as the death date of " - }, - "_is_the_same_as_": { - "message": " is the same as " - }, - "_marriage_date": { - "message": " marriage date" - }, - "_born_after_": { - "message": " born after " - }, - "_died_before_": { - "message": " died before " - }, - "_years_old_for_": { - "message": " years old for " - }, - "_marriage": { - "message": " marriage" - }, - "Birth_date_of_": { - "message": "Birth date of " - }, - "_and_": { - "message": " and " - }, - "_are_within_": { - "message": " are within " - }, - "_months": { - "message": " months" - }, - "_born_before_the_birth_of_": { - "message": " born before the birth of " - }, - "death": { - "message": "death" - }, - "_born_after_the_death_of_": { - "message": " born after the death of " - }, - "_is_under_": { - "message": " is under " - }, - "_years_old_for_the_birth_of_": { - "message": " years old for the birth of " - }, - "_is_over_": { - "message": " is over " - }, - "_born_before_the_marriage_of_": { - "message": " born before the marriage of " - }, - "_parents_": { - "message": " ouders " - }, - "_has_pending_": { - "message": " has pending " - }, - "data_conflicts": { - "message": "data conflicts" - }, - "The_age_of_": { - "message": "The age of " - }, - "_exceeds_": { - "message": " exceeds " - }, - "_years": { - "message": " years" - }, - "_is_after_": { - "message": " is after " - }, - "_death_date": { - "message": " death date" - }, - "Baptism_date_of_": { - "message": "Baptism date of " - }, - "_is_before_": { - "message": " is before " - }, - "_birth_date": { - "message": " birth date" - }, - "_burial_date": { - "message": " burial date" - }, - "_contains_a_double_space_in_": { - "message": " contains a double space in " - }, - "first_name": { - "message": "first name" - }, - "_contains_a_double_or_trailing_space_in_": { - "message": " contains a double or trailing space in " - }, - "_names": { - "message": " names" - }, - "_contains_an_alias_in_": { - "message": " contains an alias in " - }, - "_appears_to_contain_a_suffix_in_": { - "message": " appears to contain a suffix in " - }, - "Move_Suffix": { - "message": "Move Suffix" - }, - "_contains_improper_use_of_salutation_in_": { - "message": " contains improper use of salutation in " - }, - "_title": { - "message": " title" - }, - "Remove_salutation": { - "message": "Remove salutation" - }, - "_contains_improper_use_of_relationship_in_": { - "message": " contains improper use of relationship in " - }, - "_suffix": { - "message": " suffix" - }, - "Remove_relationship": { - "message": "Remove relationship" - }, - "_contains_improper_use_of_a_numbering_scheme_in_": { - "message": " contains improper use of a numbering scheme in " - }, - "Remove_numeric": { - "message": "Remove numeric" - }, - "_is_in_a_relationship_cycle_within_the_immediate_family": { - "message": " is in a relationship cycle within the immediate family" - }, - "_contains_an_invalid_": { - "message": " contains an invalid " - }, - "_date_month_greater_than_12": { - "message": " date, month greater than 12." - }, - "_date_day_greater_than_31": { - "message": " date, day greater than 31." - }, - "_date": { - "message": " date" - }, - "_contains_an_incomplete_": { - "message": " contains an incomplete " - }, - "_date_missing_month": { - "message": " date, missing month." - }, - "_date_missing_year": { - "message": " date, missing year." - }, - "_contains_a_": { - "message": " contains a " - }, - "_location_without_a_country": { - "message": " location without a country" - }, - "his": { - "message": "his" - }, - "her": { - "message": "her" - }, - "their": { - "message": "their" - }, - "mother": { - "message": "mother" - }, - "father": { - "message": "father" - }, - "parent": { - "message": "parent" - }, - "brother": { - "message": "brother" - }, - "sibling": { - "message": "sibling" - }, - "wife": { - "message": "wife" - }, - "husband": { - "message": "husband" - }, - "partner": { - "message": "partner" - }, - "Submit": { - "message": "Submit" - }, - "Profile_Data": { - "message": "Profile Data" - }, - "ExperimentalMessage": { - "message": "SmartCopy use on this website is experimental and may not be fully supported. Please be cautions and review the data thoroughly before submitting. Report issues in the" - }, - "SmartCopy_discussion_at_Geni": { - "message" :"SmartCopy discussion at Geni" - }, - "SmartCopy_was_unable_to_determine_the_Geni_profile": { - "message":"SmartCopy was unable to determine the Geni profile to use as a copy destination." - }, - "Set_Geni_Destination_Profile":{ - "message":"Set Geni Destination Profile" - }, - "Relatives":{ - "message" : "Relatives" - }, - "Select_from_History": { - "message": "Select from History" - }, - "Invalid_Profile": { - "message": "Invalid Profile Id - Try Again" - }, - "Set_Destination": { - "message": "Set Destination" - }, - "History": { - "message": "History :" - }, - "Reading_Family_Data": { - "message": "Reading Family Data ..." - }, - "Updating_Geni": { - "message": "Updating Geni" - }, - "Geni_Tree_Updated": { - "message": "Geni Tree Updated" - }, - "Reminder_Duplicate": { - "message": "Reminder: Please review for duplicates
and merge when able." - }, - "View_Profile":{ - "message":"View Profile :" - }, - "Tree_View":{ - "message":"tree view" - }, - "View_Profil":{ - "message":"profile view" - }, - "Geni_Data":{ - "message":"Geni_Data" - }, - "Update_Profile":{ - "message":"Update Profile" - }, - "Family_Members":{ - "message":"Family Members" - }, - "Parents":{ - "message":"Parents" - }, - "Siblings":{ - "message":"Siblings" - }, - "Partners":{ - "message":"Partners" - }, - "Children":{ - "message":"Children" - }, - "expand_all":{ - "message":"expand all" - }, - "collapse_all":{ - "message":"collapse all" - }, - "Title":{ - "message":"Title:" - }, - "FFirst_Name":{ - "message":"First Name:" - }, - "Middle_Name":{ - "message":"Middle Name:" - }, - "Last_Name":{ - "message":"Last Name:" - }, - "Birth_Name":{ - "message":"Birth Name:" - }, - "Suffix":{ - "message":"Suffix:" - }, - "Display_Name":{ - "message":"Display Name:" - }, - "Also_Known_As":{ - "message":"Also Known As:" - }, - "Occupation":{ - "message":"Occupation:" - }, - "Gender":{ - "message":"Gender:" - }, - "Vital":{ - "message":"Vital:" - }, - "Privacy":{ - "message":"Privacy:" - }, - "About":{ - "message":"About:" - }, - "Male":{ - "message":"Male" - }, - "Female":{ - "message":"Female" - }, - "Deceased":{ - "message":"Deceased" - }, - "LLiving":{ - "message":"Living" - }, - "Public":{ - "message":"Public" - }, - "Private":{ - "message":"Private" - }, - "Auto":{ - "message":"Auto" - }, - "Unknown":{ - "message":"Unknown" - }, - "Action":{ - "message":"Action:" - }, - "Hide_Unused_Fields":{ - "message":"Hide Unused Fields" - }, - "Show_All_Fields":{ - "message":"Show All Fields" - }, - "Update":{ - "message":"Update:" - }, - "Add":{ - "message":"Add" - }, - "Add_Profile":{ - "message":"Add Profile" - } -} +{ + "appName": { + "message": "SmartCopy" + }, + "appShortName": { + "message": "SmartCopy" + }, + "appDesc": { + "message": "Tool for copying genealogical data into Geni." + }, + "consistencyCheck": { + "message": "Consistency Check" + }, + "contains_incorrect_uppercase_lowercase_in_name": { + "message": "$person$ contains incorrect use of uppercase/lowercase in $pronoun$ name ($lang$).", + "placeholders": { + "person": { + "content": "$1" + }, + "pronoun": { + "content": "$2" + }, + "lang": { + "content": "$3" + } + } + }, + "contains_incorrect_uppercase_lowercase_in_name_default": { + "message": "$person$ contains incorrect use of uppercase/lowercase in $pronoun$ name.", + "placeholders": { + "person": { + "content": "$1" + }, + "pronoun": { + "content": "$2" + } + } + }, + "contains_patronym_in_first_name": { + "message": "$person$ contains a patro/matronym in $pronoun$ first name ($lang$).", + "placeholders": { + "person": { + "content": "$1" + }, + "pronoun": { + "content": "$2" + }, + "lang": { + "content": "$3" + } + } + }, + "contains_patronym_in_first_name_default": { + "message": "$person$ contains a patro/matronym in $pronoun$ first name.", + "placeholders": { + "person": { + "content": "$1" + }, + "pronoun": { + "content": "$2" + } + } + }, + "contains_non_patronym_in_middle_name": { + "message": "$person$ contains a non-patro/matronym in $pronoun$ middle name ($lang$).", + "placeholders": { + "person": { + "content": "$1" + }, + "pronoun": { + "content": "$2" + }, + "lang": { + "content": "$3" + } + } + }, + "contains_non_patronym_in_middle_name_default": { + "message": "$person$ contains a non-patro/matronym in $pronoun$ middle name.", + "placeholders": { + "person": { + "content": "$1" + }, + "pronoun": { + "content": "$2" + } + } + }, + "living": { + "message": "living" + }, + "claimed": { + "message": "claimed" + }, + "fixCase": { + "message": "fix case" + }, + "fixed": { + "message": "fixed" + }, + "fixName": { + "message": "fix name" + }, + "fixSpace": { + "message": "fix space" + }, + "fixSuffix": { + "message": "fix suffix" + }, + "fixTitle": { + "message": "fix title" + }, + "makePublic": { + "message": "make public" + }, + "numFamilyMembersBornBeforeYearAreSetAsPrivate": { + "message": "$count$ family members born before c.$year$ are set as private.", + "placeholders": { + "count": { + "content": "$1" + }, + "year": { + "content": "$2" + } + } + }, + "personWasBornBeforeYearAndIsSetAsPrivate": { + "message": "$person$ was born before c.$year$ and is set as private.", + "placeholders": { + "person": { + "content": "$1" + }, + "year": { + "content": "$2" + } + } + }, + "Research_this_Person": { + "message": "Research this Person" + }, + "All_Collections": { + "message": "All Collections" + }, + "Collections": { + "message": "Collections" + }, + "Publications": { + "message": "Publications" + }, + "Holocaust": { + "message": "Holocaust" + }, + "Name_Search": { + "message": "Name Search" + }, + "Gravestones": { + "message": "Gravestones" + }, + "Genealogies": { + "message": "Genealogies" + }, + "Genealogy": { + "message": "Genealogy" + }, + "Geni_Search": { + "message": "Geni Search" + }, + "Google_Search": { + "message": "Google Search" + }, + "Records": { + "message": "Records" + }, + "Messageboard": { + "message": "Messageboard" + }, + "Newspapers": { + "message": "Newspapers" + }, + "Books": { + "message": "Books" + }, + "Obituaries": { + "message": "Obituaries" + }, + "Other_Resources": { + "message": "Other Resources" + }, + "Unable_to_create_research_links_on_this_profile": { + "message": "Unable to create research links on this profile." + }, + "Loading___": { + "message": "Loading..." + }, + "Ancestor_Graph": { + "message": "Ancestor Graph" + }, + "Descendant_Graph": { + "message": "Descendant Graph" + }, + "History_Search": { + "message": "History Search" + }, + "Configuration": { + "message": "Configuration" + }, + "Copy_Preferences": { + "message": "Copy Preferences" + }, + "Consistency_Checks": { + "message": "Consistency Checks" + }, + "Geni_Customization": { + "message": "Geni Customization" + }, + "Note_Dates_that_contain_Between_Before_and_After___": { + "message": "Note: Dates that contain Between, Before, and After are not compared in consistency checks. Dates with Circa are considered as exact dates." + }, + "Run_consistency_checks_when_viewing_Geni_profiles": { + "message": "Run consistency checks when viewing Geni profiles." + }, + "Age_difference_between_partners_is_significant": { + "message": "Age difference between partners is significant" + }, + "Maiden_name_same_as_husbands_last_name": { + "message": "Maiden name same as husband's last name" + }, + "Husband_and_wife_death_dates_the_same": { + "message": "Husband and wife death dates the same" + }, + "Husband_death_date_same_as_marriage_date": { + "message": "Husband death date same as marriage date" + }, + "Wife_death_date_same_as_marriage_date": { + "message": "Wife death date same as marriage date" + }, + "Born_after_marriage": { + "message": "Born after marriage" + }, + "Died_before_marriage": { + "message": "Died before marriage" + }, + "Implausible_marriage_age_too_young": { + "message": "Implausible marriage age, too young" + }, + "Siblings_ages_too_close_together": { + "message": "Siblings ages too close together" + }, + "Born_before_parent_birth": { + "message": "Born before parent birth" + }, + "Born_after_parent_death": { + "message": "Born after parent death" + }, + "Death_before_baptism_date": { + "message": "Death before baptism date" + }, + "Death_after_burial_date": { + "message": "Death after burial date" + }, + "Parent_too_young_for_childs_birth": { + "message": "Parent too young for child's birth" + }, + "Mother_too_old_for_childs_birth": { + "message": "Mother too old for child's birth" + }, + "Born_before_parent_marriage": { + "message": "Born before parent marriage" + }, + "Excessive_Age": { + "message": "Excessive Age" + }, + "Born_after_death": { + "message": "Born after death" + }, + "Name_contains_double_space": { + "message": "Name contains double space" + }, + "Name_contains_alias": { + "message": "Name contains alias" + }, + "Name_contains_improper_use_of_uppercase_lowercase": { + "message": "Name contains improper use of uppercase/lowercase" + }, + "First_Name_ends_in_suffix_eg___": { + "message": "First Name ends in suffix (eg. 'i','ii','iii','iv','jr','sr')" + }, + "Salutation_or_relationship_in_title_eg___": { + "message": "Salutation or relationship in title (eg. 'Mr', 'Mrs')" + }, + "Salutation_or_relationship_in_suffix_eg___": { + "message": "Salutation or relationship in suffix (eg. 'Mr', 'Mrs')" + }, + "Relationship_cycle_in_immediate_family": { + "message": "Relationship cycle in immediate family" + }, + "Check_date_formatting_for_inconsistent_values": { + "message": "Check date formatting for inconsistent values" + }, + "Check_for_pending_data_conflict_resolution": { + "message": "Check for pending data conflict resolution" + }, + "Self_check_profile_for_inconsistent_dates_and_values": { + "message": "Self-check profile for inconsistent dates and values." + }, + "Check_name_fields_for_improper_values": { + "message": "Check name fields for improper values" + }, + "Check_name_fields_for_living_profiles": { + "message": "Exclude living profiles from quick fix" + }, + "Check_profile_for_pending_data_conflicts": { + "message": "Check profile for pending data conflicts" + }, + "Check_date_values_for_irregular_formatting": { + "message": "Check date values for irregular formatting" + }, + "Check_when_location_is_missing_a_country": { + "message": "Check when location is missing a country" + }, + "Maximum_year_to_be_private": { + "message": "Maximum year to be private:" + }, + "Maximum_age": { + "message": "Maximum age:" + }, + "Check_the_dates_of_children_against_their_parents": { + "message": "Check the dates of children against their parents." + }, + "Check_child_is_born_after_parent_marriage": { + "message": "Check child is born after parent marriage" + }, + "Age_the_parent_is_too_young_to_have_a_child": { + "message": "Age the parent is too young to have a child" + }, + "Age_the_mother_is_too_old_to_have_a_child": { + "message": "Age the mother is too old to have a child" + }, + "Check_the_values_of_partner_spouses_against_each_other": { + "message": "Check the values of partner/spouses against each other." + }, + "Identify_possible_maiden_name_copy_issues": { + "message": "Identify possible maiden name copy issues" + }, + "Age_the_spouse_is_too_young_to_be_married": { + "message": "Age the spouse is too young to be married" + }, + "Maximum_age_difference_between_spouses": { + "message": "Maximum age difference between spouses" + }, + "Check_siblings_birth_are_over_": { + "message": "Check siblings birth are over " + }, + "_months_apart_excl_twins": { + "message": " months apart (excl. twins)." + }, + "Future_options_to_add_features_to_Geni": { + "message": "Future options to add features to Geni." + }, + "This_profile_is_not_in_the_World_Family_Tree": { + "message": "This profile is not in the World Family Tree." + }, + "Add_to_History": { + "message": "Add to History" + }, + "Show_History": { + "message": "Show History" + }, + "Clear_History": { + "message": "Clear History" + }, + "Notice___Please_Read": { + "message": "Notice - Please Read" + }, + "SmartCopy_will_no_longer_do_geo_location_lookups___": { + "message": "SmartCopy will no longer automatically do geo-location lookups due to the cost of Google's service. While this is sad news, Geni has recently provided the feature of doing geolocation lookups after submission. When a location is submitted via the place field, Geni will do the query and populate the location fields on the website. Alternatively, you can specify your own Google API key in the configuration. You also still have the option to manually fill out the location data in SmartCopy by clicking the globe icon $globe_icon$ and if you want to disable Geni's geolocation lookup, you can do so in the SmartCopy configuration.", + "placeholders": { + "globe_icon": { + "content": "$1" + } + } + }, + "Close": { + "message": "Close" + }, + "Display_Add_Biography_button_in_About": { + "message": "Display Add Biography button in About" + }, + "Add_Biography": { + "message": "Add biography" + }, + "Export_Profiles_button_on_Project_Actions": { + "message": "Export Profiles button on Project Actions" + }, + "Export_Profiles": { + "message": "Export Profiles" + }, + + + "SmartCopy_does_not_currently_support_parsing": { + "message": "SmartCopy does not currently support parsing this page / site / collection." + }, + "SmartCopy_is_having_difficulty_reading_the_page": { + "message": "SmartCopy is having difficulty reading the page. Try refreshing the page." + }, + "This_website_is_not_yet_supported_by_SmartCopy": { + "message": "This website is not yet supported by SmartCopy." + }, + + "Selection": { + "message": "Selection" + }, + "Simplify_form_by_hiding_unused_fields": { + "message": "Simplify form by hiding unused fields" + }, + "Enable_photo_checkbox_auto_selection": { + "message": "Enable photo checkbox auto-selection" + }, + "Reminder_user_responsible": { + "message": "Reminder: The user is responsible for
obtaining any required permission from
the photographer when copying images." + }, + "Exclude_private_profile_auto_select": { + "message": "Exclude profile auto-select" + }, + "Est_burial_date_from_death_if_location": { + "message": "Est. burial date from death if location" + }, + "This_change_will_take_effect_at_next_use": { + "message": "This change will take effect at next use." + }, + "Location": { + "message": "Location" + }, + "Enable_Geolocation": { + "message": "Enable Geolocation" + }, + "API_Key": { + "message": "API Key" + }, + "Location_fields_auto_select_one_select_all": { + "message": "Location fields select one select all" + }, + "Naming": { + "message": "Naming" + }, + "Auto_populate_empty_birth_name_fields": { + "message": "Auto populate empty birth name fields" + }, + "Parse_for_middle_names_automatically": { + "message": "Parse for middle names automatically" + }, + "Auto_adjust_the_names_for_mixed_case": { + "message": "Auto-adjust the names for mixed-case" + }, + "Force_compound_lastname_to_lowercase": { + "message": "Force compound lasstname to lowercase" + }, + "Default_children_to_likely_Geni_parent": { + "message": "Default children to likely Geni parent" + }, + "Default_deceased_profiles_to_public": { + "message": "Default deceased profiles to public" + }, + "Add_reference_to_Geni_s_About_section": { + "message": "Add reference to Geni's About section" + }, + "Display_the_Geni_side_data_by_default": { + "message": "Display the Geni side data by default" + }, + + "Please_select_one_of_the_Matches": { + "message": "Please select one of the Matches on this results page." + }, + + "_year_age_difference_between_": { + "message": " year age difference between " + }, + "Birth_Surname_of_": { + "message": "Birth Surname of " + }, + "_is_the_same_as_the_last_name_of_": { + "message": " is the same as the last name of " + }, + "Death_date_of_": { + "message": "Death date of " + }, + "_is_the_same_as_the_death_date_of_": { + "message": " is the same as the death date of " + }, + "_is_the_same_as_": { + "message": " is the same as " + }, + "_marriage_date": { + "message": " marriage date" + }, + "_born_after_": { + "message": " born after " + }, + "_died_before_": { + "message": " died before " + }, + "_years_old_for_": { + "message": " years old for " + }, + "_marriage": { + "message": " marriage" + }, + "Birth_date_of_": { + "message": "Birth date of " + }, + "_and_": { + "message": " and " + }, + "_are_within_": { + "message": " are within " + }, + "_months": { + "message": " months" + }, + "_born_before_the_birth_of_": { + "message": " born before the birth of " + }, + "death": { + "message": "death" + }, + "_born_after_the_death_of_": { + "message": " born after the death of " + }, + "_is_under_": { + "message": " is under " + }, + "_years_old_for_the_birth_of_": { + "message": " years old for the birth of " + }, + "_is_over_": { + "message": " is over " + }, + "_born_before_the_marriage_of_": { + "message": " born before the marriage of " + }, + "_parents_": { + "message": " ouders " + }, + "_has_pending_": { + "message": " has pending " + }, + "data_conflicts": { + "message": "data conflicts" + }, + "The_age_of_": { + "message": "The age of " + }, + "_exceeds_": { + "message": " exceeds " + }, + "_years": { + "message": " years" + }, + "_is_after_": { + "message": " is after " + }, + "_death_date": { + "message": " death date" + }, + "Baptism_date_of_": { + "message": "Baptism date of " + }, + "_is_before_": { + "message": " is before " + }, + "_birth_date": { + "message": " birth date" + }, + "_burial_date": { + "message": " burial date" + }, + "_contains_a_double_space_in_": { + "message": " contains a double space in " + }, + "first_name": { + "message": "first name" + }, + "_contains_a_double_or_trailing_space_in_": { + "message": " contains a double or trailing space in " + }, + "_names": { + "message": " names" + }, + "_contains_an_alias_in_": { + "message": " contains an alias in " + }, + "_appears_to_contain_a_suffix_in_": { + "message": " appears to contain a suffix in " + }, + "Move_Suffix": { + "message": "Move Suffix" + }, + "_contains_improper_use_of_salutation_in_": { + "message": " contains improper use of salutation in " + }, + "_title": { + "message": " title" + }, + "Remove_salutation": { + "message": "Remove salutation" + }, + "_contains_improper_use_of_relationship_in_": { + "message": " contains improper use of relationship in " + }, + "_suffix": { + "message": " suffix" + }, + "Remove_relationship": { + "message": "Remove relationship" + }, + "_contains_improper_use_of_a_numbering_scheme_in_": { + "message": " contains improper use of a numbering scheme in " + }, + "Remove_numeric": { + "message": "Remove numeric" + }, + "_is_in_a_relationship_cycle_within_the_immediate_family": { + "message": " is in a relationship cycle within the immediate family" + }, + "_contains_an_invalid_": { + "message": " contains an invalid " + }, + "_date_month_greater_than_12": { + "message": " date, month greater than 12." + }, + "_date_day_greater_than_31": { + "message": " date, day greater than 31." + }, + "_date": { + "message": " date" + }, + "_contains_an_incomplete_": { + "message": " contains an incomplete " + }, + "_date_missing_month": { + "message": " date, missing month." + }, + "_date_missing_year": { + "message": " date, missing year." + }, + "_contains_a_": { + "message": " contains a " + }, + "_location_without_a_country": { + "message": " location without a country" + }, + "his": { + "message": "his" + }, + "her": { + "message": "her" + }, + "their": { + "message": "their" + }, + "mother": { + "message": "mother" + }, + "father": { + "message": "father" + }, + "parent": { + "message": "parent" + }, + "brother": { + "message": "brother" + }, + "sibling": { + "message": "sibling" + }, + "wife": { + "message": "wife" + }, + "husband": { + "message": "husband" + }, + "partner": { + "message": "partner" + } +} \ No newline at end of file diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json deleted file mode 100644 index 9c8fd78..0000000 --- a/_locales/fr/messages.json +++ /dev/null @@ -1,850 +0,0 @@ -{ - "appName": { - "message": "SmartCopy" - }, - "appShortName": { - "message": "SmartCopy" - }, - "appDesc": { - "message": "Outil pour copier des données généalogiques dans Geni." - }, - "consistencyCheck": { - "message": "Vérifications de cohérence" - }, - "contains_incorrect_uppercase_lowercase_in_name": { - "message": "$person$ a une typographie non conforme dans sa dénomination $pronoun$ ($lang$).", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - }, - "lang": { - "content": "$3" - } - } - }, - "contains_incorrect_uppercase_lowercase_in_name_default": { - "message": "$person$ a une typographie non conforme dans sa dénomination $pronoun$ .", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - } - } - }, - "contains_patronym_in_first_name": { - "message": "$person$ contains a patro/matronym in $pronoun$ first name ($lang$).", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - }, - "lang": { - "content": "$3" - } - } - }, - "contains_patronym_in_first_name_default": { - "message": "$person$ contains a patro/matronym in $pronoun$ first name.", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - } - } - }, - "contains_non_patronym_in_middle_name": { - "message": "$person$ contains a non-patro/matronym in $pronoun$ middle name ($lang$).", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - }, - "lang": { - "content": "$3" - } - } - }, - "contains_non_patronym_in_middle_name_default": { - "message": "$person$ contient un non-patro/matronyme dans $pronoun$ - deuxième prénom.", - "placeholders": { - "person": { - "content": "$1" - }, - "pronoun": { - "content": "$2" - } - } - }, - "living": { - "message": "vivant" - }, - "claimed": { - "message": "revendiqué" - }, - "fixCase": { - "message": "fixez la case" - }, - "fixed": { - "message": "fixé" - }, - "fixName": { - "message": "fixez le nom" - }, - "fixSpace": { - "message": "fixez l'espace" - }, - "fixSuffix": { - "message": "fixez le suffixe" - }, - "fixTitle": { - "message": "fixez le titre" - }, - "makePublic": { - "message": "rendre public" - }, - "numFamilyMembersBornBeforeYearAreSetAsPrivate": { - "message": "$count$ membres de la famille nés avant c.$year$ sont définis comme privés.", - "placeholders": { - "count": { - "content": "$1" - }, - "year": { - "content": "$2" - } - } - }, - "personWasBornBeforeYearAndIsSetAsPrivate": { - "message": "$person$ qui est né.e avant c.$year$ et est définie comme privée.", - "placeholders": { - "person": { - "content": "$1" - }, - "year": { - "content": "$2" - } - } - }, - "Research_this_Person": { - "message": "Recherchez cette personne" - }, - "All_Collections": { - "message": "Toutes Collections" - }, - "Collections": { - "message": "Collections" - }, - "Publications": { - "message": "Publications" - }, - "Holocaust": { - "message": "Holocauste" - }, - "Name_Search": { - "message": "Recherche de noms" - }, - "Gravestones": { - "message": "Gravestones" - }, - "Genealogies": { - "message": "Genealogies" - }, - "Genealogy": { - "message": "Genealogy" - }, - "Geni_Search": { - "message": "Recherche Geni" - }, - "Google_Search": { - "message": "Recherche Google" - }, - "Records": { - "message": "Enregistrements" - }, - "Messageboard": { - "message": "Tableau de messages" - }, - "Newspapers": { - "message": "Journaux" - }, - "Books": { - "message": "Livres" - }, - "Obituaries": { - "message": "Obsèques" - }, - "Other_Resources": { - "message": "Autres Resources" - }, - "Unable_to_create_research_links_on_this_profile": { - "message": "Impossible de créer des liens de recherche sur ce profil." - }, - "Loading___": { - "message": "En chargement..." - }, - "Ancestor_Graph": { - "message": "Graphe d'ascendance" - }, - "Descendant_Graph": { - "message": "Graphe de descendance" - }, - "History_Search": { - "message": "History Search" - }, - "Configuration": { - "message": "Configurations" - }, - "Copy_Preferences": { - "message": "Préférences de copiage" - }, - "Consistency_Checks": { - "message": "Vérifications de cohérence" - }, - "Geni_Customization": { - "message": "Personnalisation sur Geni" - }, - "Note_Dates_that_contain_Between_Before_and_After___": { - "message": "Remarque : Les dates contenant Entre, Avant et Après ne sont pas comparées dans les contrôles de cohérence. Les dates avec Circa sont considérées comme des dates exactes." - }, - "Run_consistency_checks_when_viewing_Geni_profiles": { - "message": "Exécuter des contrôles de cohérence lors de la visualisation des profils Geni." - }, - "Age_difference_between_partners_is_significant": { - "message": "La différence d'âge entre les partenaires est importante" - }, - "Maiden_name_same_as_husbands_last_name": { - "message": "Nom de jeune fille identique au nom de famille du mari" - }, - "Husband_and_wife_death_dates_the_same": { - "message": "Les dates de décès du mari et de la femme sont les mêmes" - }, - "Husband_death_date_same_as_marriage_date": { - "message": "Date de décès du mari identique à la date du mariage" - }, - "Wife_death_date_same_as_marriage_date": { - "message": "Date de décès de la femme identique à la date du mariage" - }, - "Born_after_marriage": { - "message": "Né.e après mariage" - }, - "Died_before_marriage": { - "message": "Mort.e avant mariage" - }, - "Implausible_marriage_age_too_young": { - "message": "Âge du mariage invraisemblable, trop jeune" - }, - "Siblings_ages_too_close_together": { - "message": "Les frères et sœurs sont trop proches les uns des autres." - }, - "Born_before_parent_birth": { - "message": "Né.e avant la naissance des parents" - }, - "Born_after_parent_death": { - "message": "Né.e après la mort des parents" - }, - "Death_before_baptism_date": { - "message": "Mort.e avant la date du baptème" - }, - "Death_after_burial_date": { - "message": "Décès après la date des funérailles" - }, - "Parent_too_young_for_childs_birth": { - "message": "Parent trop jeune pour la naissance d'un enfant" - }, - "Mother_too_old_for_childs_birth": { - "message": "Mère trop agée pour la naissance d'un enfant" - }, - "Born_before_parent_marriage": { - "message": "Né.e avant le mariage des parents" - }, - "Excessive_Age": { - "message": "Âge excessif" - }, - "Born_after_death": { - "message": "Né.e après le décès" - }, - "Name_contains_double_space": { - "message": "Le nom contient un double espace" - }, - "Name_contains_alias": { - "message": "Le nom contient des pseudonymes" - }, - "Name_contains_improper_use_of_uppercase_lowercase": { - "message": "La typographie du nom est incorrecte" - }, - "First_Name_ends_in_suffix_eg___": { - "message": "First Name ends in suffix (eg. 'i','ii','iii','iv','jr','sr')" - }, - "Salutation_or_relationship_in_title_eg___": { - "message": "Salutation or relationship in title (eg. 'Mr', 'Mrs')" - }, - "Salutation_or_relationship_in_suffix_eg___": { - "message": "Salutation or relationship in suffix (eg. 'Mr', 'Mrs')" - }, - "Relationship_cycle_in_immediate_family": { - "message": "Relationship cycle in immediate family" - }, - "Check_date_formatting_for_inconsistent_values": { - "message": "Check date formatting for inconsistent values" - }, - "Check_for_pending_data_conflict_resolution": { - "message": "Check for pending data conflict resolution" - }, - "Self_check_profile_for_inconsistent_dates_and_values": { - "message": "Self-check profile for inconsistent dates and values." - }, - "Check_name_fields_for_improper_values": { - "message": "Check name fields for improper values" - }, - "Check_name_fields_for_living_profiles": { - "message": "Exclude living profiles from quick fix" - }, - "Check_profile_for_pending_data_conflicts": { - "message": "Check profile for pending data conflicts" - }, - "Check_date_values_for_irregular_formatting": { - "message": "Vérifiez les valeurs de date pour un formatage irrégulier" - }, - "Check_when_location_is_missing_a_country": { - "message": "Vérifier quand il manque un pays à l'emplacement" - }, - "Maximum_year_to_be_private": { - "message": "Année maximum pour être privé :" - }, - "Maximum_age": { - "message": "Âge maximum :" - }, - "Check_the_dates_of_children_against_their_parents": { - "message": "Vérifiez les dates des enfants par rapport à leurs parents." - }, - "Check_child_is_born_after_parent_marriage": { - "message": "Vérifier que l'enfant est né après le mariage de ses parents" - }, - "Age_the_parent_is_too_young_to_have_a_child": { - "message": "Le parent est trop jeune pour avoir un enfant" - }, - "Age_the_mother_is_too_old_to_have_a_child": { - "message": "La mère est trop agée pour avoir un enfant." - }, - "Check_the_values_of_partner_spouses_against_each_other": { - "message": "Vérifiez les données des partenaires/conjoints les uns par rapport aux autres." - }, - "Identify_possible_maiden_name_copy_issues": { - "message": "Identifier les éventuels problèmes de copie du nom de jeune fille" - }, - "Age_the_spouse_is_too_young_to_be_married": { - "message": "Le conjoint est trop jeune pour se marier" - }, - "Maximum_age_difference_between_spouses": { - "message": "Différence d'âge maximale entre les conjoints" - }, - "Check_siblings_birth_are_over_": { - "message": "Vérifiez que la naissance des frères et sœurs est cohérente " - }, - "_months_apart_excl_twins": { - "message": " mois d'intervalle (sauf jumeaux)." - }, - "Future_options_to_add_features_to_Geni": { - "message": "Options futures pour ajouter des fonctionnalités à Geni." - }, - "This_profile_is_not_in_the_World_Family_Tree": { - "message": "Ce profil n'est pas dans le World Family Tree." - }, - "Add_to_History": { - "message": "Ajouter à l'historique" - }, - "Show_History": { - "message": "Afficher l'historique" - }, - "Hide_History": { - "message": "Masquer l'historique" - }, - "Clear_History": { - "message": "Effacer l'historique" - }, - "Notice___Please_Read": { - "message": "Avis - Veuillez lire" - }, - "SmartCopy_will_no_longer_do_geo_location_lookups___": { - "message": "SmartCopy n'effectue plus automatiquement de recherches de géolocalisation en raison du coût du service de Google. Bien que ce soit une nouvelle navrante, Geni a récemment fourni la possibilité d'effectuer des recherches de géolocalisation après demande. Lorsqu'un emplacement est soumis via le champ de lieu, Geni effectuera la requête et remplira les champs d'emplacement sur le site Web. Vous pouvez également spécifier votre propre clé API Google dans la configuration. Vous avez également toujours la possibilité de remplir manuellement les données de localisation dans SmartCopy en cliquant sur l'icône du globe $globe_icon$ et si vous souhaitez désactiver la recherche de géolocalisation de Geni, vous pouvez le faire dans la configuration de SmartCopy.", - "placeholders": { - "globe_icon": { - "content": "$1" - } - } - }, - "Close": { - "message": "Clore" - }, - "Display_Add_Biography_button_in_About": { - "message": "Afficher le bouton Ajouter une biographie dans À propos" - }, - "Add_Biography": { - "message": "Ajouter une biographie" - }, - "Export_Profiles_button_on_Project_Actions": { - "message": "Export Profiles button on Project Actions" - }, - "Export_Profiles": { - "message": "Export Profiles" - }, - - - "SmartCopy_does_not_currently_support_parsing": { - "message": "SmartCopy ne prend actuellement pas en charge l'analyse de cette page/site/collection." - }, - "SmartCopy_is_having_difficulty_reading_the_page": { - "message": "SmartCopy a des difficultés à lire la page. Essayez d'actualiser la page." - }, - "This_website_is_not_yet_supported_by_SmartCopy": { - "message": "Ce site Web n'est pas compatible avec SmartCopy." - }, - - "Selection": { - "message": "Selection" - }, - "Simplify_form_by_hiding_unused_fields": { - "message": "Simplifier le formulaire en masquant les champs inutilisés" - }, - "Enable_photo_checkbox_auto_selection": { - "message": "Activer la sélection automatique des cases à cocher des photos" - }, - "Reminder_user_responsible": { - "message": "Rappel : L'utilisateur est responsable de
l'obtention de l'autorisation requise
de l'auteur pour la copie d'images. " - }, - "Exclude_private_profile_auto_select": { - "message": "Exclure la sélection automatique du profil " - }, - "Est_burial_date_from_death_if_location": { - "message": "Est. burial date from death if location" - }, - "This_change_will_take_effect_at_next_use": { - "message": "Ce changement prendra effet lors de la prochaine utilisation." - }, - "Location": { - "message": "Localisation" - }, - "Enable_Geolocation": { - "message": "Autorise la Geolocation" - }, - "API_Key": { - "message": "Clé API" - }, - "Location_fields_auto_select_one_select_all": { - "message": "Location fields select one select all" - }, - "Naming": { - "message": "Naming" - }, - "Auto_populate_empty_birth_name_fields": { - "message": "Remplir automatiquement les noms de naissance vides" - }, - "Parse_for_middle_names_automatically": { - "message": "Analyser automatiquement les deuxièmes prénoms" - }, - "Auto_adjust_the_names_for_mixed_case": { - "message": "Ajuster automatiquement les noms pour la casse mixte" - }, - "Force_compound_lastname_to_lowercase": { - "message": "Forcer le nom de famille composé à être mis en minuscules" - }, - "Default_children_to_likely_Geni_parent": { - "message": "Default children to likely Geni parent" - }, - "Default_deceased_profiles_to_public": { - "message": "Profils de défunts rendus publics par défaut" - }, - "Add_reference_to_Geni_s_About_section": { - "message": "Ajouter une référence à la section À propos de Geni" - }, - "Display_the_Geni_side_data_by_default": { - "message": "Afficher les données côté Geni par défaut" - }, - - "Please_select_one_of_the_Matches": { - "message": "Veuillez sélectionner l'un des correspondances sur cette page de résultats." - }, - - "_year_age_difference_between_": { - "message": " années de différence entre " - }, - "Birth_Surname_of_": { - "message": "Nom de naissance de " - }, - "_is_the_same_as_the_last_name_of_": { - "message": " est le même que le nom de famille de " - }, - "Death_date_of_": { - "message": "Date de décès de " - }, - "_is_the_same_as_the_death_date_of_": { - "message": " est la même que la date du décès de " - }, - "_is_the_same_as_": { - "message": " est le même que " - }, - "_marriage_date": { - "message": " date de mariage" - }, - "_born_after_": { - "message": " né.e après " - }, - "_died_before_": { - "message": " mort.e avant " - }, - "_years_old_for_": { - "message": " years old for " - }, - "_marriage": { - "message": " mariage" - }, - "Birth_date_of_": { - "message": "Date de naissance de " - }, - "_and_": { - "message": " et " - }, - "_are_within_": { - "message": " sont à l'intérieur " - }, - "_months": { - "message": " mois" - }, - "_born_before_the_birth_of_": { - "message": " né.e avant la naissance de " - }, - "death": { - "message": "décès " - }, - "_born_after_the_death_of_": { - "message": " né.e après le décès de " - }, - "_is_under_": { - "message": " est sous " - }, - "_years_old_for_the_birth_of_": { - "message": " années pour la naissance de " - }, - "_is_over_": { - "message": " est au dessus de " - }, - "_born_before_the_marriage_of_": { - "message": " né.e avant le mariage de " - }, - "_parents_": { - "message": " aînés " - }, - "_has_pending_": { - "message": " a en attente " - }, - "data_conflicts": { - "message": "dates incohérentes" - }, - "The_age_of_": { - "message": "L'age de " - }, - "_exceeds_": { - "message": " excède " - }, - "_years": { - "message": " années " - }, - "_is_after_": { - "message": " est après " - }, - "_death_date": { - "message": " la date de décès" - }, - "Baptism_date_of_": { - "message": "La date de baptème " - }, - "_is_before_": { - "message": " est avant la" - }, - "_birth_date": { - "message": " date de naissance" - }, - "_burial_date": { - "message": " date de funérailles" - }, - "_contains_a_double_space_in_": { - "message": " contains a double space in " - }, - "first_name": { - "message": "prénom" - }, - "_contains_a_double_or_trailing_space_in_": { - "message": " contains a double or trailing space in " - }, - "_names": { - "message": " noms" - }, - "_contains_an_alias_in_": { - "message": " contient un alias dans " - }, - "_appears_to_contain_a_suffix_in_": { - "message": " semble contenir un suffixe dans " - }, - "Move_Suffix": { - "message": "Déplacer le suffixe " - }, - "_contains_improper_use_of_salutation_in_": { - "message": " contient une utilisation inappropriée du titre de civilité dans " - }, - "_title": { - "message": " titre" - }, - "Remove_salutation": { - "message": "Supprimer le titre de civilité" - }, - "_contains_improper_use_of_relationship_in_": { - "message": " contains improper use of relationship in " - }, - "_suffix": { - "message": " suffixe" - }, - "Remove_relationship": { - "message": "Supprimer la relation" - }, - "_contains_improper_use_of_a_numbering_scheme_in_": { - "message": " contient une utilisation inappropriée d'un système de numérotation dans " - }, - "Remove_numeric": { - "message": "Supprimer le numérique" - }, - "_is_in_a_relationship_cycle_within_the_immediate_family": { - "message": " est dans un cercle vicieux au sein de la famille immédiate" - }, - "_contains_an_invalid_": { - "message": " est invalide " - }, - "_date_month_greater_than_12": { - "message": " date, mois supérieur à 12." - }, - "_date_day_greater_than_31": { - "message": " date, jour supérieur à 31." - }, - "_date": { - "message": " date" - }, - "_contains_an_incomplete_": { - "message": " est incomplete " - }, - "_date_missing_month": { - "message": " date, mois manquant." - }, - "_date_missing_year": { - "message": " date, année manquante." - }, - "_contains_a_": { - "message": " contient un " - }, - "_location_without_a_country": { - "message": " endroit sans pays" - }, - "his": { - "message": "son" - }, - "her": { - "message": "sa" - }, - "their": { - "message": "leur" - }, - "mother": { - "message": "mère" - }, - "father": { - "message": "père" - }, - "parent": { - "message": "parent" - }, - "brother": { - "message": "frère ou soeur" - }, - "sibling": { - "message": "fratrie" - }, - "wife": { - "message": "femme" - }, - "husband": { - "message": "mari" - }, - "partner": { - "message": "partenaire" - }, - "Submit": { - "message": "Envoi" - }, - "Profile_Data": { - "message": "Données du Profil" - }, - "ExperimentalMessage": { - "message": "L'utilisation de SmartCopy sur ce site Web est expérimentale et peut ne pas être entièrement prise en charge. Soyez prudent et examinez attentivement les données avant de les soumettre. Signaler les problèmes sur" - }, - "SmartCopy_discussion_at_Geni": { - "message": "le fil de discussion Geni" - }, - "SmartCopy_was_unable_to_determine_the_Geni_profile": { - "message": "SmartCopy n'a pas pu déterminer le profil Geni à utiliser comme cible." - }, - "Set_Geni_Destination_Profile":{ - "message":"Définir le profil Geni à utiliser" - }, - "Relatives":{ - "message" : "Parents" - }, - "Select_from_History": { - "message":"Sélectionner dans l'historique" - }, - "Invalid_Profile": { - "message":"Identifiant de profil invalide – Réessayez" - }, - "Set_Destination": { - "message":"Appel du Profil" - }, - "History": { - "message":"Profil :" - }, - "Reading_Family_Data": { - "message":"Lecture des données familiales ..." - }, - "Updating_Geni": { - "message": "Mise à jour de Geni" - }, - "Geni_Tree_Updated": { - "message": "Arbre Geni mis à jour" - }, - "Reminder_Duplicate": { - "message": "Rappel : veuillez vérifier les doublons
et fusionner lorsque cela est possible." - }, - "View_Profile":{ - "message":"Voir le profil :" - }, - "Tree_View":{ - "message":"en arbre" - }, - "View_Profil":{ - "message":"en fiche" - }, - "Geni_Data":{ - "message":"Donnée Geni" - }, - "Update_Profile":{ - "message" :"Mise à jour du Profil" - }, - "Family_Members":{ - "message":"Membres de la famille" - }, - "Parents":{ - "message":"Parents" - }, - "Siblings":{ - "message":"Fratrie" - }, - "Partners":{ - "message":"Partenaires" - }, - "Children":{ - "message":"Enfants" - }, - "expand_all":{ - "message": "tout développer" - }, - "collapse_all":{ - "message": "tout réduire" - }, - "Title":{ - "message": "Titre:" -}, -"FFirst_Name":{ - "message":"Prénom: " -}, -"Middle_Name":{ - "message":"Autres prénoms:" -}, -"Last_Name":{ - "message":"Patronyme:" -}, -"Birth_Name":{ - "message":"Nom de naissance:" -}, -"Suffix":{ - "message":"Suffixe:" -}, -"Display_Name":{ - "message":"Nom d'usage:" -}, -"Also_Known_As":{ - "message":"Alias:" -}, -"Occupation":{ - "message":"Profession:" -}, -"Gender":{ - "message":"Genre:" -}, -"Vital":{ - "message":"Existence:" -}, -"Privacy":{ - "message":"Confidentialité:" -}, -"About":{ - "message":"A Propos:" -}, -"Male":{ - "message":"Homme" -}, -"Female":{ - "message":"Femme" -}, -"Deceased":{ - "message":"Décédé(e)" -}, -"LLiving":{ - "message":"Vivant(e)" -}, -"Public":{ - "message":"Publique" -}, -"Private":{ - "message":"Privée" -}, -"Auto":{ - "message":"Auto" -}, -"Unknown":{ - "message":"Inconnu" -}, -"Action":{ - "message":"Action:" -}, -"Hide_Unused_Fields":{ - "message":"Masquer les champs inutilisés" -}, -"Show_All_Fields":{ - "message":"Afficher tous les champs" -}, -"Update":{ - "message":"Mise à jour:" -}, -"Add":{ - "message":"Ajout" -}, -"Add_Profile":{ - "message":"Ajouter le profil" -} -} diff --git a/background.js b/background.js index 23d4a4f..c3c2edc 100644 --- a/background.js +++ b/background.js @@ -39,30 +39,49 @@ function getJsonFromUrl(query) { // listen for messages - if they include photo URLs, intercept and get them chrome.runtime.onMessage.addListener( function(request, sender, callback) { if (request.action == "xhttp") { - delay(190);// see https://www.nginx.com/blog/rate-limiting-nginx/ const method = request.method ? request.method.toUpperCase() : 'GET'; if (method == 'POST') { - const jsData = getJsonFromUrl(request.data); - //console.log("jsDATA :",jsData.photo,jsData.file); - if (jsData.photo !== undefined) { - const photoOk = GetPhoto(jsData); - /*Chargement de la Photo par appel Url et mise en place d'un appel POST pour la transférer dans Geni - Loading the Photo by Url call and setting up a POST call for transfer into Geni. - Les parametres de l'appel sont transmis dans l'Objet "request", request.url contient l'url, request.data contient 3 clés à l'origine title, attribution, et photo l'url de l'image à charger -data.title, data.attribution et data.photo. Pendant le traitement, on crée la clé "data.file" qu'on remplit avec une chaine codée en base64. On efface data.photo. - The parameters of the call are transmitted in the "request" Object, request.url contains the url, request.data contains 3 keys at the origin title, attribution, and photo the url of the image to load - data.title, data.attribution and data.photo. During processing, we create the “data.file” key which we fill with a base64 encoded string. We delete data.photo. - https://www.geni.com/api/profile-34835287013/add-photo?fields=id,unions,name&access_token=AEWNhgu5Mdz7kGa4pXPXMohl45ZLVeoo1kFUH4p6 - */ - photoOk.then((jsData) => { - request.data = jsData - //console.log("RQ_DAT1 url :",request.url,jsData.photo,jsData.file); - const header = "application/x-www-form-urlencoded"; - GeniPostReq(request,header,callback); + fetch(request.url, { + method : method, + body: request.data, + headers: { + "Content-Type" : "application/x-www-form-urlencoded" + } + }).then((response) => { + if (!response.ok) { + console.error("Unable to get XMLHttpRequest: " + request.url); + var valrtn = {error: response.error, variable: request.variable, responseURL: response.responseURL}; + callback(valrtn); + } else { + const responseText = response.text(); + var valrtn = {source: responseText, variable: request.variable, responseURL: response.responseURL}; + callback(valrtn); + const jsData = getJsonFromUrl(request); + if (jsData.photo !== undefined) { + // load the photo from the given URL + fetch(jsData.photo, { + method: 'GET', + headers: { + "Content-Type" : "text/plain; charset=UTF-8" + } + }).then((photoResponse) => { + if (!photoResponse.ok) { + var valrtn = {error: photoResponse.error, responseURL: photoResponse.responseURL}; + callback(valrtn); + } else { + const photo = photoResponse.text() + let binary = "" + for(i=0;i { - if (!response.ok) { - return response.text() - .then((responseText)=> { - console.error("Unable to get Fetch Request: " + request.url); - var valrtn = {error: responseText, variable: request.variable, responseURL: request.url}; - console.log("valrtn_FL ",valrtn,request.data); - callback(valrtn); - }); - - } else { - return response.text() - .then((responseText)=> { - var valrtn = {source: responseText, variable: request.variable, responseURL: request.url}; - //console.log("valrtn_OK ",valrtn); - callback(valrtn); - }); - } - }) - } - // load the photo from the given URL -async function GetPhoto (jsData){ +}); - /* - Réécriture du 23 nov 2024. -Utilisation des API JS "ReadableStream: getReader() method" avec la method "read" qui récupère morceaux par morceaux (chunks) les éléments de l'image dans le contexte asynchrone. -Rewritten from Nov 23, 2024. -Using the JS API "ReadableStream: getReader() method" with the "read" method which retrieves the image elements piece by piece (chunks) in the asynchronous context -https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/getReader -La propriete "text()" de fetch ne se comporte pas comme xhr.responseText. -The "text()" property of fetch does not behave like xhr.responseText -*/ -try { - const photoResponse = await fetch(jsData.photo, { - method: 'GET', - mode: "cors", - headers: { - "Content-Type" : "application/xml", - // "Access-Control-Allow-Origin": "*", - // "Access-Control-Allow-Methods": "GET", - // "Access-Control-Max-Age": "86400", - }, - //credentials: "include", - // superflu jusqu'à preuve du contraire - superfluous until proven otherwise - }); - if (!photoResponse.ok) { - throw new Error(`Erreur Photo : ${photoResponse.status}`); - } - const photoreader = photoResponse.body.getReader(); - let binary = ""; - while (true){ - const {done,value} = await photoreader.read(); - if (done){ -// L'image est entièrement récupéré, on prépare les parametres du POST -// The image is fully recovered, we prepare the POST parameters - delete jsData.photo; - jsData.file = btoa(binary); - jsData = getUrlFromJson(jsData); - return jsData; - } -// Traitement de chaque chunk récupéré - Processing each retrieved chunk -// et construction progressive de la chaine binaire. - and progressive construction of the binary chain. - charsReceived = value.length; - for(i=0;i 0) { @@ -90,7 +84,7 @@ function updateGeo() { } } } - for (var i = 0; i < geounique.length; i++) { + for (var i=0; i 0) { setTimeout(updateFamily, 50); } else { //console.log(geounique); - for (var i = 0; i < geocleanup.length; i++) { - for (var x = 0; x < geounique.length; x++) { + for (var i=0; i < geocleanup.length; i++) { + for (var x=0; x < geounique.length; x++) { if (geocleanup[i].location === geounique[x].location) { geolocation[geocleanup[i].id] = geolocation[geounique[x].id]; //console.log("Adding " + geounique[x].id + " to " + geocleanup[i].id); @@ -126,8 +120,8 @@ function updateGeoLocation() { if (geostatus.length > 0) { setTimeout(updateGeoLocation, 50); } else { - var locationdata = geolocation[geoid - 1]; - var eventrow = $('#' + googlerequery); + var locationdata = geolocation[geoid-1]; + var eventrow = $('#'+googlerequery); var pincolor = "clear"; if (locationdata.ambiguous || locationdata.count > 1) { pincolor = "yellow"; @@ -237,24 +231,13 @@ function buildForm() { if (focusgender === "unknown" && alldata["profile"].gender !== "unknown") { focusgender = alldata["profile"].gender; } - if (focusgender === "male") { - husbandlastname = nameval.lastName; - if ($('#birthonoffswitch').prop('checked') && nameval.birthName === "") { + if ($('#birthonoffswitch').prop('checked') && nameval.birthName === "") { + if (focusgender === "male") { + nameval.birthName = nameval.lastName; + } else if (focusgender === "female" && setBirthName("focus", nameval.lastName, mnameonoff)) { nameval.birthName = nameval.lastName; + nameval.lastName = ""; } - } - if (focusgender === "female") { - if (nameval.birthName ==""){ - if (setBirthName("focus", nameval.lastName, mnameonoff)) { - nameval.birthName = nameval.lastName; - } - } - if ( nameval.birthName === "") { - nameval.birthName = nameval.lastName; - nameval.lastName = ""; - } - wifelastname = nameval.birthName; - } if (exists(alldata["profile"].nicknames)) { if (nameval.nickName !== "") { @@ -272,46 +255,46 @@ function buildForm() { var namescore = scorefactors.contains("middle name"); let namelang = genifocusdata.get("name_language"); let langtarget = Object.assign({}, $("#language_selector")); - $(langtarget).find("select").attr("id", "profilelanguage"); - let regex = new RegExp('value="' + namelang + '">', "gm"); + $(langtarget).find("select").attr("id","profilelanguage"); + let regex = new RegExp('value="' + namelang + '">',"gm"); membersstring += '' + $(langtarget).html().replace(regex, "value='" + namelang + "' selected>"); + '' var expand = true; if (exists(alldata["profile"]["birth"]) && exists(alldata["profile"]["birth"][0]) && exists(alldata["profile"]["birth"][0]["date"])) { var dt = moment(alldata["profile"]["birth"][0]["date"], getDateFormat(alldata["profile"]["birth"][0]["date"])); var year = dt.get('year'); - if (year < datelimit) { + if (year < 1600) { expand = false; - + } } else if (exists(alldata["profile"]["death"]) && exists(alldata["profile"]["death"][0]) && exists(alldata["profile"]["death"][0]["date"])) { var dt = moment(alldata["profile"]["death"][0]["date"], getDateFormat(alldata["profile"]["death"][0]["date"])); var year = dt.get('year'); - if (year < datelimit) { + if (year < 1600) { expand = false; } } if (expand) { if (namescore && mnameonoff) { membersstring += - ' '+_("Title","Title:")+'' + - ''+_("FFirst_Name","First Name:")+'' + - ''+_("Middle_Name","Middle Name:")+'' + - ''+_("Last_Name","Last Name:")+'' + - ''+_("Birth_Name","Birth Name:")+'' + - ''+_("Suffix","Suffix:")+' ' + - ''+_("Display_Name","Display Name:")+' ' + - ''+_("Also_Known_As","Also Known As:")+' '; + 'Title:' + + 'First Name:' + + 'Middle Name:' + + 'Last Name:' + + 'Birth Name:' + + 'Suffix: ' + + 'Display Name: ' + + 'Also Known As: '; x += 1; } else { membersstring += - ''+_("Title","Title:")+'' + - ''+_("FFirst_Name","First Name:")+'' + - ''+_("Middle_Name","Middle Name:")+'' + - ''+_("Last_Name","Last Name:")+'' + - ''+_("Birth_Name","Birth Name:")+'' + - ''+_("Suffix","Suffix:")+' ' + - ''+_("Display_Name","Display Name:")+' ' + - ''+_("Also_Known_As","Also Known As:")+' '; + 'Title:' + + 'First Name:' + + 'Middle Name:' + + 'Last Name:' + + 'Birth Name:' + + 'Suffix: ' + + 'Display Name: ' + + 'Also Known As: '; } $(div[0]).html(membersstring); if (exists(alldata["profile"]["thumb"])) { @@ -365,21 +348,21 @@ function buildForm() { } else { membersstring = $(div[0]).html(); membersstring = membersstring + - ''+_("Occupation","Occupation:")+' '; + 'Occupation: '; $(div[0]).html(membersstring); } if (genigender === "unknown" && focusgender !== "unknown") { var gender = focusgender; sepx++; membersstring = $(div[0]).html(); - membersstring = membersstring + ''+_("Gender","Gender:")+' '; + membersstring = membersstring + 'Gender: '; $(div[0]).html(membersstring); } else { var gender = focusgender; membersstring = $(div[0]).html(); - membersstring = membersstring + ''+_("Gender","Gender:")+' '; + membersstring = membersstring + 'Gender: '; $(div[0]).html(membersstring); } var living = false; @@ -402,50 +385,27 @@ function buildForm() { if (exists(birthval.year) && birthval.year < agelimit) { living = false; } - if (exists(birthval.year) && birthval.year < agelimit - 25) { - console.log("Birth et limit",birthval.year,agelimit - 25); - contemporary = false; - } - } - } - } else if (alldata["profile"]["death"]){ - var deathdate = null; - for (var b = 0; b < alldata["profile"]["death"].length; b++) { - if (exists(alldata["profile"]["death"][b].date) && alldata["profile"]["death"][b].date.trim() !== "") { - deathdate = alldata["profile"]["death"][b].date; - break; - } - if (deathdate !== null) { - var deathval = parseDate(deathdate, false); - var agelimit = moment.utc().format("YYYY") - 95; - if (exists(deathval.year)) { - living = false; - } - if (exists(deathval.year) && deathval.year < agelimit - 10) { - console.log("Death et limit",deathval.year,agelimit - 10); - contemporary = false; - } } } } membersstring = $(div[0]).html(); if (geniliving && !living) { sepx++; - membersstring = membersstring + ''+_("Vital","Vital:")+' '; + membersstring = membersstring + 'Vital: '; } else { if (!geniliving && living) { living = geniliving; } - membersstring = membersstring + ''+_("Vital","Vital:")+' '; + membersstring = membersstring + 'Vital: '; } if ($('#privacyonoffswitch').prop('checked') && !living) { - membersstring = membersstring + ''+_("Privacy","Privacy:")+' '; + membersstring = membersstring + 'Privacy: '; } else { - membersstring = membersstring + ''+_("Privacy","Privacy:")+' '; + membersstring = membersstring + 'Privacy: '; } $(div[0]).html(membersstring); if (exists(alldata["profile"].about)) { @@ -456,11 +416,11 @@ function buildForm() { // scoreabout = false; // } var about = alldata["profile"].about; - membersstring = membersstring + '
'+_("About","About:")+'
'; + membersstring = membersstring + '
About:
'; $(div[0]).html(membersstring); } else { membersstring = $(div[0]).html(); - membersstring = membersstring + '
'+_("About","About:")+'
'; + membersstring = membersstring + '
About:
'; $(div[0]).html(membersstring); } if (sepx === 0) { @@ -516,9 +476,9 @@ function buildForm() { var dateval = obj[item].date; var dateambig = ""; - if (dateAmbigous(dateval)) { - dateambig = 'style="color: #ff0000;" '; - } + if (dateAmbigous(dateval)) { + dateambig = 'style="color: #ff0000;" '; + } membersstring = membersstring + '' + capFL(title) + ' Date:'; @@ -557,12 +517,12 @@ function buildForm() { var country = geovar1.country; var geoone = ($('#forcegeoswitch').prop('checked') && (isValue(city) || isValue(county) || isValue(state) || isValue(country))); locationval = locationval + - '
' + - 'Toggle Geolocation'; - if (geoqueryCheck()) { - locationval = locationval + ''; - } - locationval = locationval + '' + capFL(title) + ' Location:  ' + place.replace(//g, ">") + '
' + + '
' + + 'Toggle Geolocation'; + if (geoqueryCheck()) { + locationval = locationval + ''; + } + locationval = locationval + '' + capFL(title) + ' Location:  ' + place.replace(//g, ">") + '
' + '' + capFL(title) + ' Place:' + 'Place: ' + 'City: ' + @@ -582,11 +542,11 @@ function buildForm() { } if (!locationadded) { locationval = locationval + - '
Toggle Geolocation'; - if (geoqueryCheck()) { - locationval = locationval + ''; - } - locationval = locationval + '' + capFL(title) + ' Location:  '+_("Unknown","Unknown")+'
' + + '
Toggle Geolocation'; + if (geoqueryCheck()) { + locationval = locationval + ''; + } + locationval = locationval + '' + capFL(title) + ' Location:  Unknown
' + '' + capFL(title) + ' Place: ' + 'Place: ' + 'City: ' + @@ -606,11 +566,11 @@ function buildForm() { membersstring = membersstring + 'Death Cause: '; } membersstring = membersstring + - '
Toggle Geolocation'; - if (geoqueryCheck()) { - membersstring = membersstring + ''; - } - membersstring = membersstring + '' + capFL(title) + ' Location:  '+_("Unknown","Unknown")+'
' + + '
Toggle Geolocation'; + if (geoqueryCheck()) { + membersstring = membersstring + ''; + } + membersstring = membersstring + '' + capFL(title) + ' Location:  Unknown
' + '' + capFL(title) + ' Place: ' + 'Place: ' + 'City: ' + @@ -622,11 +582,11 @@ function buildForm() { $(div[0]).html(membersstring); } } else { - + x = 1; $("#profileexpand").html('
Profile Update Disabled: pre-1600
') document.getElementById("profiledata").style.display = "block"; - + } x = sepx + x; if (ck > 0) { @@ -725,7 +685,7 @@ function buildForm() { if (scorefactors.contains("father") && !geniHas("father") && members[member].gender !== "female") { scored = true; $('#addparentck').prop('checked', true); - } else if (scorefactors.contains("mother") && !geniHas("mother") && members[member].gender !== "male") { + } else if (scorefactors.contains("mother") && !geniHas("mother") && members[member].gender !== "male") { scored = true; $('#addparentck').prop('checked', true); } @@ -741,39 +701,17 @@ function buildForm() { } if (exists(members[member].alive)) { living = members[member].alive; - } else if ((relationship == "child" || relationship == "partner" )&& contemporary){ - if(!exists(members[member].death)){ - living = true ; - } } - // if ($('#birthonoffswitch').prop('checked') && nameval.birthName === "") { + if ($('#birthonoffswitch').prop('checked') && nameval.birthName === "") { if (members[member].gender === "male") { - if ($('#birthonoffswitch').prop('checked') && nameval.birthName === "") { nameval.birthName = nameval.lastName; - } } else if (members[member].gender === "female" && setBirthName(relationship, nameval.lastName, mnameonoff)) { - - //console.log("Naissance : " + nameval.birthName); - console.log("Marital last : " + nameval.lastName); - if(nameval.birthName ==""){ - nameval.birthName = nameval.lastName; - if (!$('#birthonoffswitch').prop('checked') && nameval.lastName == nameval.birthName){ - nameval.lastName = ""; - } - } - - if (isParent(relationship)) { - nameval.lastName = husbandlastname + wifelastname; // l'un ou lautre, nom du mari ou de la femme - } - if(isPartner(relationship)){ - console.log("Partner_OK !"); - nameval.lastName = husbandlastname - } - + nameval.birthName = nameval.lastName; + nameval.lastName = ""; } else if (members[member].gender === "unknown" && relationship !== "parent") { nameval.birthName = nameval.lastName; } - // } + } if (exists(members[member].nicknames)) { if (nameval.nickName !== "") { nameval.nickName += ","; @@ -810,11 +748,7 @@ function buildForm() { if (exists(members[member]["birth"]) && exists(members[member]["birth"][0]) && exists(members[member]["birth"][0]["date"])) { var dt = moment(members[member]["birth"][0]["date"], getDateFormat(members[member]["birth"][0]["date"])); var year = dt.get('year'); - if(year< moment.utc().format("YYYY") - 150) - { - contemporary = false; - } - if (year < datelimit) { + if (year < 1600) { checkunknown = " disabled"; scored = false; expand = false; @@ -823,7 +757,7 @@ function buildForm() { } else if (exists(members[member]["death"]) && exists(members[member]["death"][0]) && exists(members[member]["death"][0]["date"])) { var dt = moment(members[member]["death"][0]["date"], getDateFormat(members[member]["death"][0]["date"])); var year = dt.get('year'); - if (year < datelimit) { + if (year < 1600) { checkunknown = " disabled"; scored = false; expand = false; @@ -843,8 +777,8 @@ function buildForm() { if (expand) { membersstring += ''; } - membersstring += '' + escapeHtml(fullname.replace(/"/g, '"')) + ''; - + membersstring += '' + escapeHtml(fullname.replace(/"/g, '"')) + ''; + if (halfsibling) { membersstring += 'half-sibling'; } @@ -858,13 +792,13 @@ function buildForm() { membersstring += 'Relation:' + buildUnknown(gender) + ''; } var showimg = "images/show.png"; - var showtitle = _("Show_All_Fields","Show All Fields"); + var showtitle = "Show All Fields"; if (expand) { if (!$('#hideemptyonoffswitch').prop('checked')) { showimg = "images/hide.png"; - showtitle = _("Hide_Unused_Fields","Hide Unused Fields"); + showtitle = "Hide Unused Fields"; } - membersstring += ''+_("Action","Action:")+'' + buildAction(relationship, gender, i) + ''; + membersstring += 'Action:' + buildAction(relationship, gender, i) + ''; if (isChild(relationship) || relationship === "unknown") { var parentrel = "Parent"; @@ -875,7 +809,7 @@ function buildForm() { } membersstring += '' + parentrel + ':' + buildParentSelect(members[member].parent_id) + ''; } - + if (exists(members[member]["thumb"])) { var thumbnail = members[member]["thumb"]; var image = members[member]["image"]; @@ -896,39 +830,39 @@ function buildForm() { let namelang = "en-US"; let langtarget = Object.assign({}, $("#language_selector")); $(langtarget).find("select").attr("id", i + "_geni_name_language"); - let regex = new RegExp('value="' + namelang + '">', "gm"); + let regex = new RegExp('value="' + namelang + '">',"gm"); membersstring += '' + $(langtarget).html().replace(regex, "value='" + namelang + "' selected>"); + '' membersstring += - ''+_("Title","Title:")+'' + - ''+_("FFirst_Name","First Name:")+'' + - ''+_("Middle_Name","Middle Name:")+'' + - ''+_("Last_Name","Last Name:")+'' + - ''+_("Birth_Name","Birth Name:")+'' + - ''+_("Suffix","Suffix:")+' ' + - ''+_("Display_Name","Display Name:")+' ' + - ''+_("Also_Known_As","Also Known As:")+' '; + 'Title:' + + 'First Name:' + + 'Middle Name:' + + 'Last Name:' + + 'Birth Name:' + + 'Suffix: ' + + 'Display Name: ' + + 'Also Known As: '; if (exists(members[member]["occupation"])) { var occupation = members[member]["occupation"].trim(); - membersstring = membersstring + ''+_("Occupation","Occupation:")+' '; + membersstring = membersstring + 'Occupation: '; } else { - membersstring = membersstring + ''+_("Occupation","Occupation:")+' '; + membersstring = membersstring + 'Occupation: '; } - membersstring = membersstring + ''+_("Gender","Gender:")+' ' + - ''+_("Vital","Vital:")+' '; + membersstring = membersstring + 'Gender: ' + + 'Vital: '; if ($('#privacyonoffswitch').prop('checked') && !living) { - membersstring = membersstring + ''+_("Privacy","Privacy:")+' '; + membersstring = membersstring + 'Privacy: '; } else { - membersstring = membersstring + ''+_("Privacy","Privacy:")+' '; + membersstring = membersstring + 'Privacy: '; } if (exists(members[member].about)) { var about = members[member].about; - membersstring = membersstring + '
'+_("About","About:")+'
'; + membersstring = membersstring + '
About:
'; } else { - membersstring = membersstring + '
'+_("About","About:")+'
'; + membersstring = membersstring + '
About:
'; } for (var list in listvalues) if (listvalues.hasOwnProperty(list)) { var title = listvalues[list]; @@ -977,18 +911,18 @@ function buildForm() { var country = geovar2.country; var geoone = ($('#forcegeoswitch').prop('checked') && (isValue(city) || isValue(county) || isValue(state) || isValue(country))); locationval = locationval + - '
' + + '
' + 'Toggle Geolocation'; - if (geoqueryCheck()) { - locationval = locationval + ''; - } - locationval = locationval + '' + capFL(title) + ' Location:  ' + place.replace(//g, ">") + '
' + - '' + Abbr(capFL(title)) + ' Place: ' + - 'Place: ' + - 'City: ' + - 'County: ' + - 'State: ' + - 'Country: '; + if (geoqueryCheck()) { + locationval = locationval + ''; + } + locationval = locationval + '' + capFL(title) + ' Location:  ' + place.replace(//g, ">") + '
' + + '' + Abbr(capFL(title)) + ' Place: ' + + 'Place: ' + + 'City: ' + + 'County: ' + + 'State: ' + + 'Country: '; locationadded = true; } } @@ -1007,18 +941,18 @@ function buildForm() { } if (!locationadded) { locationval = locationval + - '
' + + '
' + 'Toggle Geolocation'; - if (geoqueryCheck()) { - locationval = locationval + ''; - } - locationval = locationval + '' + capFL(title) + ' Location:  '+_("Unknown","Unknown")+'
' + - '' + Abbr(capFL(title)) + ' Place: ' + - 'Place: ' + - 'City: ' + - 'County: ' + - 'State: ' + - 'Country: '; + if (geoqueryCheck()) { + locationval = locationval + ''; + } + locationval = locationval + '' + capFL(title) + ' Location:  Unknown
' + + '' + Abbr(capFL(title)) + ' Place: ' + + 'Place: ' + + 'City: ' + + 'County: ' + + 'State: ' + + 'Country: '; } membersstring = membersstring + locationval; @@ -1030,29 +964,29 @@ function buildForm() { membersstring = membersstring + 'Death Cause: '; } membersstring = membersstring + - '
' + + '
' + 'Toggle Geolocation'; - if (geoqueryCheck()) { - membersstring = membersstring + ''; - } - membersstring = membersstring + '' + capFL(title) + ' Location:  '+_("Unknown","Unknown")+'
' + + if (geoqueryCheck()) { + membersstring = membersstring + ''; + } + membersstring = membersstring +'' + capFL(title) + ' Location:  Unknown
' + '' + Abbr(capFL(title)) + ' Place: ' + - 'Place: ' + - 'City: ' + - 'County: ' + - 'State: ' + - 'Country: '; + 'Place: ' + + 'City: ' + + 'County: ' + + 'State: ' + + 'Country: '; } } } membersstring = membersstring + ''; $(entry).html(membersstring); - for (var i = 0; i < ambigdatecheck.length; i++) { + for (var i=0;i", { value: -1, - text: _("Unknown","Unknown") + text: "Unknown" })); } } @@ -1522,7 +1456,7 @@ function placementUpdate() { replacestring += section2[0].outerHTML; replacestring = replacestring.replace(unkop, ""); replacestring = replacestring.replace(/-unknown/g, "-" + this.value); - replacestring = replacestring.replace('relationship="unknown"', 'relationship="' + this.value + '"'); + replacestring = replacestring.replace('relationship="unknown"','relationship="' + this.value + '"'); section1[0].outerHTML = ""; section2[0].outerHTML = ""; var section3 = $("#" + this.value + "val"); @@ -1655,7 +1589,7 @@ function setBirthName(relation, lastname, mnameonoff) { function buildUnknown(gender) { var pselect = ""; - pselect += ''; + pselect += ''; if (gender === "unknown") { pselect += ''; pselect += ''; @@ -1668,7 +1602,7 @@ function buildUnknown(gender) { pselect += ''; } pselect += ''; - } else if (gender === "female") { + } else if (gender === "female"){ pselect += ''; pselect += ''; if (focusgender !== "female") { @@ -1709,36 +1643,36 @@ function buildAction(relationship, gender, id) { if (!genifamilydata.hasOwnProperty(node)) continue; var familymem = genifamilydata[node]; if (relationship === "father" && familymem.get("relation") === "father") { - pselect += ''; + pselect += ''; genibuildaction[familymem.get("id")] = id; selected = false; } else if (relationship === "mother" && familymem.get("relation") === "mother") { - pselect += ''; + pselect += ''; genibuildaction[familymem.get("id")] = id; selected = false; } else if (relationship === "brother" && familymem.get("relation") === "brother") { - pselect += ''; + pselect += ''; } else if (relationship === "sister" && familymem.get("relation") === "sister") { - pselect += ''; + pselect += ''; } else if (relationship === "son" && familymem.get("relation") === "son") { - pselect += ''; + pselect += ''; } else if (relationship === "daughter" && familymem.get("relation") === "daughter") { - pselect += ''; + pselect += ''; } else if ((isPartner(familymem.get("relation")) && isPartner(relationship)) || (isChild(familymem.get("relation")) && relationship === "child") || (isSibling(familymem.get("relation")) && relationship === "sibling") || (isParent(familymem.get("relation")) && relationship === "parent") || (familymem.get("relation") === "child" && isChild(relationship)) || (familymem.get("relation") === "sibling" && isSibling(relationship)) || - (familymem.get("relation") === "parent" && isParent(relationship))) { - pselect += ''; + (familymem.get("relation") === "parent" && isParent(relationship))) { + pselect += ''; } } } if (selected) { - pselect = '' + pselect; + pselect = '' + pselect; } else { - pselect = '' + pselect; + pselect = '' + pselect; } pselect = ''; @@ -1772,7 +1706,7 @@ function buildParentSelect(id) { } else if (id == -1 && geniparent && genispouse.length === 1) { geniselect = " selected"; } else if (id == -1) { - pselect += ''; + pselect += ''; } for (var key in myhspouse) if (myhspouse.hasOwnProperty(key)) { if (exists(databyid[myhspouse[key]])) { @@ -1788,7 +1722,7 @@ function buildParentSelect(id) { function updateInfoData(person, arg) { - if (!exists(person) || person === "") { + if (!exists(person) || person === "") { return arg; } person["url"] = arg["url"]; @@ -1861,12 +1795,12 @@ function updateInfoData(person, arg) { } if (exists(arg.birthyear) && !exists(person.birth)) { person["birth"] = [ - { "date": arg.birthyear } + {"date": arg.birthyear} ]; } if (exists(arg.deathyear) && !exists(person.death)) { person["death"] = [ - { "date": arg.deathyear } + {"date": arg.deathyear} ]; } if (!exists(person["alive"]) && !tablink.contains("/collection-1/") && exists(person["birth"])) { @@ -1882,9 +1816,6 @@ function updateInfoData(person, arg) { var agelimit = moment.utc().format("YYYY") - 95; if (exists(birthval.year) && birthval.year >= agelimit) { person["alive"] = true; - contemporary = true; - } else { - contemporary = false; } } } @@ -1914,9 +1845,6 @@ function updateInfoData(person, arg) { var agelimit = moment.utc().format("YYYY") - 95; if (exists(birthval.year) && birthval.year >= agelimit) { person["alive"] = true; - contemporary = true; - } else { - contemporary = false; } } } @@ -1951,8 +1879,8 @@ function cleanDate(dateval) { if (dateval.contains("(aged")) { dateval = dateval.replace(/ \(.*\)/gm, ""); } - - dateval = dateval.replace(/–/g, "-"); + + dateval = dateval.replace(/–/g,"-"); dateval = dateval.replace(/ - /g, "-"); dateval = dateval.replace(/\?/g, ""); dateval = dateval.replace(/ABT\.? /i, "Circa "); @@ -1969,9 +1897,9 @@ function cleanDate(dateval) { dateval = dateval.replace(/\s+/g, ' '); if (dateval.contains(".")) { if (dateval.search(/\w\./) !== -1) { - dateval = dateval.replace(/\./g, ""); + dateval = dateval.replace(/\./g,""); } else { - dateval = dateval.replace(/\./g, "-"); + dateval = dateval.replace(/\./g,"-"); } } @@ -1984,11 +1912,11 @@ function cleanDate(dateval) { } dateval = "Between " + dateval.replace("-", andval); } else if (dateval.search(/\d{4}\/\d{2}/) !== -1) { - dateval = dateval.replace(/\d{2}\//, ""); + dateval = dateval.replace(/\d{2}\//,""); } - + dateval = dateval.replace("Between Between", "Between"); - dateval = dateval.replace("Circa Circa", "Circa"); + dateval = dateval.replace("Circa Circa","Circa"); dateval = dateval.replace(/\s?\/\s?/g, "-"); if (dateval.startsWith("To")) { @@ -2020,7 +1948,7 @@ function cleanDate(dateval) { } else if (dateval.search(/\D, \d/) !== -1) { dateval = dateval.replace(",", ""); } - + /* TODO Trying to set the format to MMM D YYYY, can produce Jan 1 YYYY if no month or day is present var momentval = moment(dateval.replace("Circa ", ""), getDateFormat(dateval.replace("Circa ", "")), true); @@ -2093,7 +2021,7 @@ function recursiveCompare(obj, reference) { return true; //Every object and array is equal } -function checkBurial(profiledata) { +function checkBurial(profiledata){ var data = []; var dd = profiledata["death"][0]["date"].trim(); if (dd.startsWith("Between")) { @@ -2116,7 +2044,7 @@ function checkBurial(profiledata) { dd = "After " + dd; } if (!dd.startsWith("Between")) { - data.push({ date: dd }); + data.push({date: dd}); data.push(profiledata["burial"][0]); profiledata["burial"] = data; } @@ -2167,7 +2095,7 @@ function emptyEvent(data) { if (exists(data)) { if (exists(data.date)) { var eventdate = data.date; - for (var key in eventdate) { + for (var key in eventdate){ var value = eventdate[key]; if (key === "year" && isNaN(value)) { value = ""; @@ -2179,7 +2107,7 @@ function emptyEvent(data) { } if (exists(data.location)) { var eventlocation = data.location; - for (var key in eventlocation) { + for (var key in eventlocation){ var value = eventlocation[key]; if (value !== "") { return false; @@ -2205,7 +2133,7 @@ function setGeniFamilyData(id, profile) { let namelang = $("#" + id + "_geni_name_language").val(); $("#" + id + "_geni_photo_urls").attr('src', getGeniData(profile, "photo_urls")); $("#" + id + "_geni_mugshot").attr('src', isAppend(getGeniData(profile, "photo_urls"))); - $("#" + id + "_geni_title").val(getGeniData(profile, "names", namelang + ".title")); + $("#" + id + "_geni_title").val(getGeniData(profile, "names", namelang + ".title")); $("#" + id + "_geni_title").prev().attr('src', nameicon); $("#" + id + "_geni_first_name").val(getGeniData(profile, "names", namelang + ".first_name").replace(/"/g, '"')); $("#" + id + "_geni_first_name").prev().attr('src', nameicon); @@ -2224,7 +2152,7 @@ function setGeniFamilyData(id, profile) { $("#" + id + "_geni_about").attr('src', isAppend(profile)); $("#" + id + "_geni_occupation").val(getGeniData(profile, "occupation")); $("#" + id + "_geni_occupation").prev().attr('src', getGeniLock(profile, "occupation")); - $("#" + id + "_geni_gender").val(isGender(getGeniData(profile, "gender"))); + $("#" + id + "_geni_gender").val(capFL(getGeniData(profile, "gender"))); $("#" + id + "_geni_gender").prev().attr('src', getGeniLock(profile, "gender")); $("#" + id + "_geni_is_alive").val(isAlive(getGeniData(profile, "is_alive"))); $("#" + id + "_geni_is_alive").prev().attr('src', getGeniLock(profile, "living")); @@ -2254,34 +2182,22 @@ function setGeniFamilyData(id, profile) { } } -function isGender(genre){ - if (genre === "") { - return ""; - } else if (genre ==="male") { - return _("Male","Male"); - } else if (genre ==="female") { - return _("Female","Female:"); - } - else { - return _("Unknown","Unknown"); - } - } function isAlive(alive) { if (alive === "") { return ""; } else if (alive) { - return _("LLiving","Living:"); + return "Living"; } else { - return _("Deceased","Deceased:"); + return "Deceased"; } } function isPublic(privacy) { if (privacy) { - return _("Public","Public:"); + return "Public"; } else { - return _("Private","Private:"); + return "Private"; } } diff --git a/collections/familysearchjson.js b/collections/familysearchjson.js index b79ae49..d92c109 100644 --- a/collections/familysearchjson.js +++ b/collections/familysearchjson.js @@ -1,65 +1,31 @@ // Parse FamilySearch Genealogies registerCollection({ - reload: false, - recordtype: "FamilySearch Genealogy", - prepareUrl: function (url) { + "reload": false, + "recordtype": "FamilySearch Genealogy", + "prepareUrl": function(url) { url = url.replace("://www.", "://"); - if (ftUrlMatches(url, ["https://familysearch.org/{locale}/pal:"])) { - var urlparts = url.split("?"); - focusURLid = urlparts[0].substring(url.lastIndexOf("/") + 1); - url = - hostDomain(url) + - getFtUrlLocale(url) + - "/service/tree/tree-data/person/" + - focusURLid + - "/all?locale=en"; + if (startsWithHTTP(url,"https://familysearch.org/pal:")) { + var urlparts= url.split('?'); + focusURLid = urlparts[0].substring(url.lastIndexOf('/') + 1); + url = hostDomain(url) + "/service/tree/tree-data/person/" + focusURLid + "/all?locale=en"; this.reload = true; - } else if ( - ftUrlMatches(url, ["https://familysearch.org/{locale}/tree/"]) && - !ftUrlMatches(url, ["https://familysearch.org/{locale}/tree/find"]) - ) { - focusURLid = getParameterByName("person", url); + } else if (startsWithHTTP(url,"https://familysearch.org/tree/") && !startsWithHTTP(url, "https://familysearch.org/tree/find")) { + focusURLid = getParameterByName('person', url); if (focusURLid === "") { - url = url - .replace("/details", "") - .replace("/memories", "") - .replace("/landscape", "") - .replace("/portrait", "") - .replace("/fanchart", "") - .replace("/descendancy", ""); - focusURLid = url.substring(url.lastIndexOf("/") + 1); + url = url.replace("/details", "").replace("/memories", "").replace("/landscape", "").replace("/portrait", "").replace("/fanchart", "").replace("/descendancy", ""); + focusURLid = url.substring(url.lastIndexOf('/') + 1); if (exists(focusURLid) && focusURLid.contains("?")) { - focusURLid = focusURLid.substring( - 0, - focusURLid.lastIndexOf("?"), - ); + focusURLid = focusURLid.substring(0, focusURLid.lastIndexOf('?')); } } - url = - hostDomain(url) + - getFtUrlLocale(url) + - "/service/tree/tree-data/person/" + - focusURLid + - "/all"; + url = hostDomain(url) + "/service/tree/tree-data/person/" + focusURLid + "/all?locale=en"; this.reload = true; - } else if ( - ftUrlMatches(url, "https://familysearch.org/{locale}/ark:") && - !url.contains("/1:1:") - ) { - var urlparts = url.split("?"); - focusURLid = urlparts[0].substring(url.lastIndexOf(":") + 1); - url = - hostDomain(url) + - getFtUrlLocale(url) + - "/service/tree/tree-data/person/" + - focusURLid + - "/all"; + } else if (startsWithHTTP(url,"https://familysearch.org/ark:") && !url.contains("/1:1:")) { + var urlparts= url.split('?'); + focusURLid = urlparts[0].substring(url.lastIndexOf(':') + 1); + url = hostDomain(url) + "/service/tree/tree-data/person/" + focusURLid + "/all?locale=en"; this.reload = true; - } else if ( - ftUrlMatches(url, [ - "https://familysearch.org/{locale}/service/tree/tree-data/", - ]) - ) { + } else if (startsWithHTTP(url,"https://familysearch.org/service/tree/tree-data/")) { var focussplit = url.split("/"); if (focussplit.length > 1) { focusURLid = focussplit[focussplit.length - 2]; @@ -67,58 +33,39 @@ registerCollection({ } return url; }, - collectionMatch: function (url) { + "collectionMatch": function(url) { url = url.replace("://www.", "://"); return ( - ftUrlMatches(url, [ - "https://familysearch.org/{locale}/service/tree", - "https://familysearch.org/{locale}/tree-data", - "https://familysearch.org/{locale}/tree/", - "https://familysearch.org/{locale}/pal:", - ]) || - (ftUrlMatches(url, ["https://familysearch.org/{locale}/ark:"]) && - !url.contains("/1:1:") && - !url.contains("/2:2:")) - ); - }, - parseData: function (url) { - if ( - ftUrlMatches(url, ["https://familysearch.org/{locale}/tree/find"]) - ) { - document.querySelector("#loginspinner").style.display = "none"; - setMessage( - warningmsg, - "SmartCopy does not work on Search pages. Please select one of the Profile pages on this site.", + startsWithHTTP(url,"https://familysearch.org/service/tree") || + startsWithHTTP(url,"https://familysearch.org/tree-data") || + startsWithHTTP(url,"https://familysearch.org/tree/") || + startsWithHTTP(url,"https://familysearch.org/pal:") || + (startsWithHTTP(url,"https://familysearch.org/ark:") && !url.contains("/1:1:") && !url.contains("/2:2:")) ); + }, + "parseData": function(url) { + if (startsWithHTTP(url, "https://familysearch.org/tree/find")) { + document.querySelector('#loginspinner').style.display = "none"; + setMessage(warningmsg, 'SmartCopy does not work on Search pages. Please select one of the Profile pages on this site.'); } else { getPageCode(); } }, - loadPage: function (request) { + "loadPage": function(request) { var parsed = ""; try { parsed = JSON.parse(request.source); - } catch (err) { - setMessage( - warningmsg, - "There was a problem retrieving FamilySearch data.
Please verify you are logged in " + - "https://familysearch.org", - ); + } catch(err) { + setMessage(warningmsg, "There was a problem retrieving FamilySearch data.
Please verify you are logged in " + + "https://familysearch.org"); document.getElementById("top-container").style.display = "block"; document.getElementById("submitbutton").style.display = "none"; document.getElementById("loading").style.display = "none"; return; } if (parsed["status"] !== "OK") { - setMessage( - warningmsg, - 'There was a problem reading this FamilySearch profile.
Unable to retrive the data via the id "' + - '' + - focusURLid + - '".', - ); + setMessage(warningmsg, 'There was a problem reading this FamilySearch profile.
Unable to retrive the data via the id "' + + '' + focusURLid + '".'); document.getElementById("top-container").style.display = "block"; document.getElementById("submitbutton").style.display = "none"; document.getElementById("loading").style.display = "none"; @@ -126,18 +73,11 @@ registerCollection({ } var focusperson; - if ( - parsed["data"]["nameConclusion"] && - parsed["data"]["nameConclusion"]["details"] && - parsed["data"]["nameConclusion"]["details"]["nameForms"] - ) { + if (parsed["data"]["nameConclusion"] && parsed["data"]["nameConclusion"]["details"] && + parsed["data"]["nameConclusion"]["details"]["nameForms"]) { focusperson = NameParse.parse(parsed["data"]["name"], mnameonoff); if (focusperson.lastName !== "") { - focusperson.lastName = NameParse.cleanName( - parsed["data"]["nameConclusion"]["details"]["nameForms"][0][ - "familyPart" - ], - ); + focusperson.lastName = NameParse.cleanName(parsed["data"]["nameConclusion"]["details"]["nameForms"][0]["familyPart"]); if (focusperson.lastName.contains(focusperson.middleName)) { focusperson.middleName = ""; } @@ -145,86 +85,23 @@ registerCollection({ } else { focusperson = parsed["data"]["name"]; } - focusURLid = parsed["data"]["id"]; //In case it is merged with another profile - update + focusURLid = parsed["data"]["id"]; //In case it is merged with another profile - update focusname = focusperson; focusrange = parsed["data"]["lifeSpan"] || ""; }, - parseProfileData: parseFamilySearchJSON, + "parseProfileData": parseFamilySearchJSON }); -function ftUrlMatches(url, urlPatterns) { - return urlPatterns.some((pattern) => { - // If pattern contains {locale} template - if (pattern.includes("{locale}")) { - // Try each supported locale - return supportedLocales.some((locale) => { - const resolvedPattern = pattern.replace("{locale}", locale); - return startsWithHTTP(url, resolvedPattern); - }); - } else { - // Direct match for patterns without locale template - return startsWithHTTP(url, pattern); - } - }); -} - -function getFtUrlLocale(url) { - const prefix = hostDomain(url); - urlPath = url.replace(prefix + "/", ""); - const maybeLocale = urlPath.split("/")[0]; - if (supportedLocales.includes(maybeLocale)) { - return "/" + maybeLocale; - } else return ""; -} - -const supportedLocales = [ - "en", - "ar", - "cs", - "da", - "de", - "es", - "es-mx", - "et", - "fi", - "fr", - "he", - "hi", - "id", - "it", - "ja", - "ko", - "ms", - "nl", - "no", - "pl", - "pt", - "pt-br", - "ru", - "sv", - "th", - "uk", - "vi", - "zh-hk", - "zh-hans", - "zh-hant", - "zh-tw", - "zh", -]; - function parseFamilySearchJSON(htmlstring, familymembers, relation) { relation = relation || ""; var parsed = null; try { var parsed = JSON.parse(htmlstring); - } catch (err) { + } catch(err) { document.getElementById("top-container").style.display = "block"; document.getElementById("submitbutton").style.display = "none"; document.getElementById("loading").style.display = "none"; - setMessage( - errormsg, - "SmartCopy was unable to retrieve the FamilySearch data. Please refresh the page and try again.", - ); + setMessage(errormsg, 'SmartCopy was unable to retrieve the FamilySearch data. Please refresh the page and try again.'); console.log(err); } @@ -232,17 +109,11 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { return ""; } var focusperson; - if ( - parsed["data"]["nameConclusion"] && - parsed["data"]["nameConclusion"]["details"] && - parsed["data"]["nameConclusion"]["details"]["nameForms"] - ) { + if (parsed["data"]["nameConclusion"] && parsed["data"]["nameConclusion"]["details"] && + parsed["data"]["nameConclusion"]["details"]["nameForms"]) { focusperson = NameParse.parse(parsed["data"]["name"], mnameonoff); if (focusperson.lastName !== "") { - var familyPart = - parsed["data"]["nameConclusion"]["details"]["nameForms"][0][ - "familyPart" - ]; + var familyPart = parsed["data"]["nameConclusion"]["details"]["nameForms"][0]["familyPart"]; if (exists(familyPart)) { focusperson.lastName = NameParse.cleanName(familyPart); if (focusperson.lastName.contains(focusperson.middleName)) { @@ -254,6 +125,7 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { } focusperson.lastName = ""; } + } $("#readstatus").html(escapeHtml(focusperson.displayname)); } else { @@ -262,12 +134,9 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { } var focusdaterange = parsed["data"]["lifeSpan"] || ""; + var genderval = String(parsed["data"]["gender"] || "unknown").toLowerCase(); - var profiledata = { - name: focusperson, - gender: genderval, - status: relation.title, - }; + var profiledata = {name: focusperson, gender: genderval, status: relation.title}; var burialdtflag = false; var buriallcflag = false; var deathdtflag = false; @@ -322,19 +191,12 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { for (var i = 0; i < eventinfo.length; i++) { var evt = eventinfo[i]; var type = evt["type"].toLowerCase(); - if ( - type === "residence" || - type === "military_service" || - type === "naturalization" - ) { + if (type === "residence" || type === "military_service" || type === "naturalization") { var abt = "* '''" + NameParse.fix_case(type) + "''': "; var residence = evt["details"]; if (residence["place"] && residence["place"]["originalText"]) { abt = abt + residence["place"]["originalText"]; - if ( - residence["date"] && - residence["date"]["originalText"] - ) { + if (residence["date"] && residence["date"]["originalText"]) { abt = abt + " - " + residence["date"]["originalText"]; } aboutdata += abt + "\n"; @@ -342,10 +204,7 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { } else if (type === "alternate_name") { var evt = eventinfo[i]; if (evt["details"] && evt["details"]["fullText"]) { - var altname = evt["details"]["fullText"] - .replace(/,/g, "") - .replace(/"/g, '"') - .trim(); + var altname = evt["details"]["fullText"].replace(/,/g,"").replace(/"/g,'"').trim(); if (!nicknames.contains(altname)) { if (nicknames !== "") { nicknames += ","; @@ -366,253 +225,156 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { } if (familymembers) { - profiledata["url"] = - hostDomain(tablink) + "/tree/person/details/" + focusURLid; + profiledata["url"] = hostDomain(tablink) + "/tree/person/details/" + focusURLid; } else { - profiledata["url"] = - hostDomain(tablink) + "/tree/person/details/" + relation.itemId; + profiledata["url"] = hostDomain(tablink) + "/tree/person/details/" + relation.itemId; } // ---------------------- Family Data -------------------- if (familymembers) { familystatus.push(famid); - var url = - hostDomain(tablink) + - "/service/tree/tree-data/r9/family-members/person/" + - focusURLid + - "?includePhotos=true&locale=en"; - chrome.runtime.sendMessage( - { - method: "GET", - action: "xhttp", - url: url, - variable: profiledata, - }, - function (response) { - if (response.status == 400) { - setMessage( - warningmsg, - "There was a problem retrieving FamilySearch data.
Please verify you are logged in " + - "https://familysearch.org", - ); - document.getElementById("top-container").style.display = - "block"; - document.getElementById("submitbutton").style.display = - "none"; - document.getElementById("loading").style.display = "none"; - return; - } - var source = JSON.parse(response.source); - var jsonrel = source["parents"]; - var parentset; - if (jsonrel) { - for (var x = 0; x < jsonrel.length; x++) { - if (jsonrel[x]["children"]) { - var childset = jsonrel[x]["children"]; - for (var i = 0; i < childset.length; i++) { - let child = childset[i]["child"]; - if (child["id"] === focusURLid) { - parentset = jsonrel[x]["coupleId"]; - var image = child["portraitUrl"] || ""; - if ( - image !== "" && - image.startsWith("http") - ) { - profiledata["image"] = image; - profiledata["thumb"] = image; - } - var parents = parentset.split("_"); - var [data_m,data_d] = parseFSJSONUnion( - jsonrel[x]["event"], - ); - for (var y = 0; y < parents.length; y++) { - var parentid = parents[y]; - var image = ""; - if ( - jsonrel[x]["parent1"] && - jsonrel[x]["parent1"]["id"] === - parentid - ) { - image = - jsonrel[x]["parent1"][ - "portraitUrl" - ] || ""; - } else if ( - jsonrel[x]["parent2"] && - jsonrel[x]["parent2"]["id"] === - parentid - ) { - image = - jsonrel[x]["parent2"][ - "portraitUrl" - ] || ""; - } - if (y === 0) { - processFamilySearchJSON( - parentid, - "parents", - famid, - image, - data_m, - data_d - ); - } else { - processFamilySearchJSON( - parentid, - "parents", - famid, - image, - ); - } - famid++; - } - break; + var url = hostDomain(tablink) + "/service/tree/tree-data/r9/family-members/person/" + focusURLid + "?includePhotos=true&locale=en"; + chrome.runtime.sendMessage({ + method: "GET", + action: "xhttp", + url: url, + variable: profiledata + }, function (response) { + if (response.status == 400) { + setMessage(warningmsg, "There was a problem retrieving FamilySearch data.
Please verify you are logged in " + + "https://familysearch.org"); + document.getElementById("top-container").style.display = "block"; + document.getElementById("submitbutton").style.display = "none"; + document.getElementById("loading").style.display = "none"; + return; + } + var source = JSON.parse(response.source); + var jsonrel = source["parents"]; + var parentset; + if (jsonrel) { + for (var x = 0; x < jsonrel.length; x++) { + if (jsonrel[x]["children"]) { + var childset = jsonrel[x]["children"]; + for (var i = 0; i < childset.length; i++) { + let child = childset[i]["child"]; + if (child["id"] === focusURLid) { + parentset = jsonrel[x]["coupleId"]; + var image = child["portraitUrl"] || ""; + if (image !== "" && image.startsWith("http")) { + profiledata["image"] = image; + profiledata["thumb"] = image; } - } - } - } - for (var x = 0; x < jsonrel.length; x++) { - if (jsonrel[x]["children"]) { - var childset = jsonrel[x]["children"]; - var coupleid = jsonrel[x]["coupleId"]; - for (var i = 0; i < childset.length; i++) { - let child = childset[i]["child"]; - if (child["id"] !== focusURLid) { - var relation = "sibling"; - if (parentset !== coupleid) { - relation = "halfsibling"; + var parents = parentset.split("_"); + var data = parseFSJSONUnion(jsonrel[x]["event"]); + for (var y=0; y < parents.length; y++) { + var parentid = parents[y]; + var image = ""; + if (jsonrel[x]["husband"] && jsonrel[x]["husband"]["id"] === parentid) { + image = jsonrel[x]["husband"]["portraitUrl"] || ""; + } else if (jsonrel[x]["wife"] && jsonrel[x]["wife"]["id"] === parentid) { + image = jsonrel[x]["wife"]["portraitUrl"] || ""; + } + if (y === 0) { + processFamilySearchJSON(parentid, "parents", famid, image, data); + } else { + processFamilySearchJSON(parentid, "parents", famid, image); } - var image = child["portraitUrl"] || ""; - processFamilySearchJSON( - child["id"], - relation, - famid, - image, - ); famid++; } + break; } } } } - - var jsonrel = source["spouses"]; - if (jsonrel) { - for (var x = 0; x < jsonrel.length; x++) { - var spouse = jsonrel[x]["id"]; - var image = jsonrel[x]["portraitUrl"] || ""; - if ( - jsonrel[x]["parent2"] && - jsonrel[x]["parent2"]["id"] !== focusURLid - ) { - spouse = jsonrel[x]["parent2"]["id"]; - image = jsonrel[x]["parent2"]["portraitUrl"] || ""; - } else if ( - jsonrel[x]["parent1"] && - jsonrel[x]["parent1"]["id"] !== focusURLid - ) { - spouse = jsonrel[x]["parent1"]["id"]; - image = jsonrel[x]["parent1"]["portraitUrl"] || ""; - } - if (spouse) { - var [data_m,data_d] = parseFSJSONUnion(jsonrel[x]["event"]); - var valid = processFamilySearchJSON( - spouse, - "spouse", - famid, - image, - data_m, - data_d - ); - if (valid) { - fsspouselist.push(spouse); - myhspouse.push(famid); + for (var x = 0; x < jsonrel.length; x++) { + if (jsonrel[x]["children"]) { + var childset = jsonrel[x]["children"]; + var coupleid = jsonrel[x]["coupleId"]; + for (var i = 0; i < childset.length; i++) { + let child = childset[i]["child"]; + if (child["id"] !== focusURLid) { + var relation = "sibling"; + if (parentset !== coupleid) { + relation = "halfsibling" + } + var image = child["portraitUrl"] || ""; + processFamilySearchJSON(child["id"], relation, famid, image); famid++; } } } - - // ---------------------- Children -------------------- - if (fsspouselist.length > 0) { - for (var x = 0; x < fsspouselist.length; x++) { - var spouse = fsspouselist[x]; - familystatus.push(famid); - //https://familysearch.org/en/tree-data/family-members/couple/LKKN-H49_LH2H-51B/children?focusPersonId=LH2H-51B&includePhotos=true&locale=en - var url = - hostDomain(tablink) + - getFtUrlLocale(tablink) + - "/service/tree/tree-data/r9/family-members/couple/" + - spouse + - "_" + - focusURLid + - "/children?focusPersonId=" + - focusURLid + - "&includePhotos=true&locale=en"; - var subdata = { spouse: spouse }; - chrome.runtime.sendMessage( - { - method: "GET", - action: "xhttp", - url: url, - variable: subdata, - }, - function (response) { - if (response.status == 400) { - setMessage( - warningmsg, - "There was a problem retrieving FamilySearch data.
Please verify you are logged in " + - "https://familysearch.org", - ); - document.getElementById( - "top-container", - ).style.display = "block"; - document.getElementById( - "submitbutton", - ).style.display = "none"; - document.getElementById( - "loading", - ).style.display = "none"; - return; - } - var arg = response.variable; - var childset = JSON.parse(response.source); - for (var i = 0; i < childset.length; i++) { - var child = childset[i]["child"]; - var itemid = child["id"]; - var image = child["portraitUrl"] || ""; - childlist[famid] = $.inArray( - arg.spouse, - unionurls, - ); - processFamilySearchJSON( - itemid, - "child", - famid, - image, - ); - famid++; - } - familystatus.pop(); - }, - ); + } + } + + var jsonrel = source["spouses"]; + if (jsonrel) { + for (var x = 0; x < jsonrel.length; x++) { + var spouse = jsonrel[x]["id"]; + var image = jsonrel[x]["portraitUrl"] || ""; + if (jsonrel[x]["parent2"] && jsonrel[x]["parent2"]["id"] !== focusURLid) { + spouse = jsonrel[x]["parent2"]["id"]; + image = jsonrel[x]["parent2"]["portraitUrl"] || ""; + } else if (jsonrel[x]["parent1"] && jsonrel[x]["parent1"]["id"] !== focusURLid) { + spouse = jsonrel[x]["parent1"]["id"]; + image = jsonrel[x]["parent1"]["portraitUrl"] || ""; + } + if (spouse) { + var data = parseFSJSONUnion(jsonrel[x]["event"]); + var valid = processFamilySearchJSON(spouse, "spouse", famid, image, data); + if (valid) { + fsspouselist.push(spouse); + myhspouse.push(famid); + famid++; } } } - familystatus.pop(); - }, - ); + + // ---------------------- Children -------------------- + if (fsspouselist.length > 0) { + for (var x = 0; x < fsspouselist.length; x++) { + var spouse = fsspouselist[x]; + familystatus.push(famid); + //https://familysearch.org/tree-data/family-members/couple/LKKN-H49_LH2H-51B/children?focusPersonId=LH2H-51B&includePhotos=true&locale=en + var url = hostDomain(tablink) + "/service/tree/tree-data/r9/family-members/couple/" + spouse + "_" + focusURLid + "/children?focusPersonId=" + focusURLid + "&includePhotos=true&locale=en"; + var subdata = {spouse: spouse}; + chrome.runtime.sendMessage({ + method: "GET", + action: "xhttp", + url: url, + variable: subdata + }, function (response) { + if (response.status == 400) { + setMessage(warningmsg, "There was a problem retrieving FamilySearch data.
Please verify you are logged in " + + "https://familysearch.org"); + document.getElementById("top-container").style.display = "block"; + document.getElementById("submitbutton").style.display = "none"; + document.getElementById("loading").style.display = "none"; + return; + } + var arg = response.variable; + var childset = JSON.parse(response.source); + for (var i = 0; i < childset.length; i++) { + var child = childset[i]["child"]; + var itemid = child["id"]; + var image = child["portraitUrl"] || ""; + childlist[famid] = $.inArray(arg.spouse, unionurls); + processFamilySearchJSON(itemid, "child", famid, image); + famid++; + } + familystatus.pop(); + }); + } + } + } + familystatus.pop(); + }); } if (focusdaterange !== "") { profiledata["daterange"] = focusdaterange; } - if ( - !burialdtflag && - buriallcflag && - deathdtflag && - $("#burialonoffswitch").prop("checked") - ) { + if (!burialdtflag && buriallcflag && deathdtflag && $('#burialonoffswitch').prop('checked')) { profiledata = checkBurial(profiledata); } @@ -627,71 +389,34 @@ function parseFamilySearchJSON(htmlstring, familymembers, relation) { updateGeo(); } return profiledata; + } function parseFSJSONUnion(eventinfo) { - - var data_m = []; - var data_d = []; - var dateval = ""; - var eventlocation = ""; -//console.log("Eventinfo",eventinfo); - if (eventinfo && - eventinfo["type"] && - eventinfo["type"].toLowerCase() === "marriage") { - - //I don't know if these two scenarios still exist, in doubt ... (standardDate and or originalDate) + var data = []; + + if (eventinfo && eventinfo["type"] && eventinfo["type"].toLowerCase() === "marriage") { + var dateval = ""; if (eventinfo["standardDate"]) { dateval = eventinfo["standardDate"]; } else if (eventinfo["originalDate"]) { dateval = eventinfo["originalDate"]; - }else if (eventinfo.details.date) { // addition following debugging - dateval = eventinfo.details.date.normalizedText; } if (dateval !== "") { - data_m.push({date: cleanDate(dateval)}); + data.push({date: cleanDate(dateval)}); } - - //idem + var eventlocation = ""; if (eventinfo["standardPlace"]) { eventlocation = eventinfo["standardPlace"].trim(); } else if (eventinfo["originalPlace"]) { eventlocation = eventinfo["originalPlace"].trim(); - } else if (eventinfo.details.place){ // addition following debugging - if (eventinfo.details.place.normalizedText){ - eventlocation = eventinfo.details.place.normalizedText.trim() - } - if (eventinfo.details.place.originalText && eventlocation == "" ){ - eventlocation = eventinfo.details.place.originalText.trim() - } - if (eventlocation == ""){ - console.log("LocalizedText",eventinfo.details.place.localizedText); - } } if (eventlocation !== "") { - data_m.push({id: geoid, location: eventlocation}); + data.push({id: geoid, location: eventlocation}); geoid++; } } - if (eventinfo && eventinfo["type"] && eventinfo["type"].toLowerCase() === "divorce") { - dateval = ""; - eventlocation = ""; - if (eventinfo.details.date) { - dateval = eventinfo.details.date.normalizedText; - } - if (dateval !== "") { - data_d.push({date: cleanDate(dateval)}); - } - - if (eventinfo.details.place){ - eventlocation = eventinfo.details.place.normalizedText.trim() - } - if (eventlocation !== "") { - data_d.push({id: geoid, location: eventlocation}); - geoid++; - } - } - return [data_m,data_d]; + return data; } function parseFSJSONDate(eventinfo) { @@ -714,25 +439,16 @@ function parseFSJSONDate(eventinfo) { } else if (details["date"]["original"]) { dateval = details["date"]["original"]; } - if ( - details["date"]["modifier"] && - !dateval - .toLowerCase() - .startsWith(details["date"]["modifier"].toLowerCase()) - ) { - dateval = details["date"]["modifier"] + " " + dateval; + if (details["date"]["modifier"] && !dateval.toLowerCase().startsWith(details["date"]["modifier"].toLowerCase())) { + dateval = details["date"]["modifier"] + " " + dateval; } - if (checkNested(details["date"], "fields", 0, "values", 0, "labelId")) { - if ( - details["date"]["fields"][0]["values"][0]["labelId"].contains( - "EST", - ) - ) { - dateval = "Circa " + dateval; + if (checkNested(details["date"],"fields",0,"values",0,"labelId")) { + if (details["date"]["fields"][0]["values"][0]["labelId"].contains("EST")) { + dateval = "Circa " + dateval; } } if (dateval !== "") { - data.push({ date: cleanDate(dateval) }); + data.push({date: cleanDate(dateval)}); } } if (details["place"]) { @@ -747,73 +463,56 @@ function parseFSJSONDate(eventinfo) { eventlocation = details["place"]["original"].trim(); } if (eventlocation !== "") { - data.push({ id: geoid, location: eventlocation }); + data.push({id: geoid, location: eventlocation}); geoid++; } } return data; } + + function getFamilySearchJSON(famid, url, subdata) { familystatus.push(famid); - chrome.runtime.sendMessage( - { - method: "GET", - action: "xhttp", - url: url, - variable: subdata, - }, - function (response) { - var arg = response.variable; - var person = parseFamilySearchJSON(response.source, false, { - title: arg.title, - proid: arg.profile_id, - itemId: arg.itemId, - }); - if (person === undefined || person === "") { - familystatus.pop(); - return; - } - if (arg.halfsibling) { - person["halfsibling"] = true; - } - if (arg.marriage) { - person["marriage"] = arg.marriage; - } - if (arg.divorce) { - person["divorce"] = arg.divorce; - } - if (arg.parent_id) { - person["parent_id"] = arg.parent_id; - } - if (arg.image) { - person["image"] = arg.image; - person["thumb"] = arg.image; - } - //person = updateInfoData(person, arg); - person["itemId"] = arg.itemId; - person["profile_id"] = arg.profile_id; - databyid[arg.profile_id] = person; - alldata["family"][arg.title].push(person); + chrome.runtime.sendMessage({ + method: "GET", + action: "xhttp", + url: url, + variable: subdata + }, function (response) { + var arg = response.variable; + var person = parseFamilySearchJSON(response.source, false, {"title": arg.title, "proid": arg.profile_id, "itemId": arg.itemId}); + if (person === "") { familystatus.pop(); - }, - ); + return; + } + if (arg.halfsibling) { + person["halfsibling"] = true; + } + if (arg.marriage) { + person["marriage"] = arg.marriage; + } + if (arg.parent_id) { + person["parent_id"] = arg.parent_id; + } + if (arg.image) { + person["image"] = arg.image; + person["thumb"] = arg.image; + } + //person = updateInfoData(person, arg); + person["itemId"] = arg.itemId; + person["profile_id"] = arg.profile_id; + databyid[arg.profile_id] = person; + alldata["family"][arg.title].push(person); + familystatus.pop(); + }); } -function processFamilySearchJSON(itemid, title, famid, image, data_m,data_d) { - // Case of one of the two parents unknown (not referenced) - if (itemid ==="UNKNOWN"){ - return false; - } +function processFamilySearchJSON(itemid, title, famid, image, data) { if (itemid === focusURLid) { return false; } - var url = - hostDomain(tablink) + - getFtUrlLocale(tablink) + - "/service/tree/tree-data/person/" + - itemid + - "/all"; + var url = hostDomain(tablink) + "/service/tree/tree-data/person/" + itemid + "/all?locale=en"; if (!exists(alldata["family"][title])) { alldata["family"][title] = []; } @@ -822,11 +521,8 @@ function processFamilySearchJSON(itemid, title, famid, image, data_m,data_d) { } var subdata = {title: title, url: url, itemId: itemid, profile_id: famid}; - if (!$.isEmptyObject(data_m)) { - subdata["marriage"] = data_m; - } - if (!$.isEmptyObject(data_d)) { - subdata["divorce"] = data_d; + if (!$.isEmptyObject(data)) { + subdata["marriage"] = data; } if (title === "halfsibling") { subdata["halfsibling"] = true; @@ -840,4 +536,4 @@ function processFamilySearchJSON(itemid, title, famid, image, data_m,data_d) { unionurls[famid] = itemid; getFamilySearchJSON(famid, url, subdata); return true; -} +} \ No newline at end of file diff --git a/collections/findagrave.js b/collections/findagrave.js index f376fea..419ee56 100644 --- a/collections/findagrave.js +++ b/collections/findagrave.js @@ -6,7 +6,7 @@ registerCollection({ "collectionMatch": function(url) { return (startsWithHTTP(url, "https://www.findagrave.com") || startsWithHTTP(url, "https://findagrave.com") || - startsWithHTTP(url, "https://forum.findagrave.com")||startsWithHTTP(url, "https://fr.findagrave.com")); //TODO filter with all lang prefix + startsWithHTTP(url, "https://forum.findagrave.com")); }, "parseData": function(url) { if (url.contains("page=gsr")) { @@ -30,7 +30,7 @@ registerCollection({ }, "parseProfileData": parseFindAGrave }); -const regsaut = /[\r\n\t]+/g ; + // Parse FindAGrave function parseFindAGrave(htmlstring, familymembers, relation) { @@ -98,10 +98,10 @@ function parseFindAGrave(htmlstring, familymembers, relation) { if (exists(abouttemp)) { aboutdata = $($.parseHTML(abouttemp.replace(/
/g, "\n"))).text().trim(); } - profiledata = addEvent(profiledata, "birth", parsed.find("#birthDateLabel").text(), parsed.find("#birthLocationLabel").text().replace(regsaut, '').trim()); - profiledata = addEvent(profiledata, "baptism", parsed.find("#baptismDateLabel").text(), parsed.find("#baptismLocationLabel").text().replace(regsaut, '').trim()); - profiledata = addEvent(profiledata, "death", parsed.find("#deathDateLabel").text(), parsed.find("#deathLocationLabel").text().replace(regsaut, '').trim()); - let cemetery = parsed.find("#burialLocationLabel").text().replace(regsaut, '').trim(); + profiledata = addEvent(profiledata, "birth", parsed.find("#birthDateLabel").text(), parsed.find("#birthLocationLabel").text()); + profiledata = addEvent(profiledata, "baptism", parsed.find("#baptismDateLabel").text(), parsed.find("#baptismLocationLabel").text()); + profiledata = addEvent(profiledata, "death", parsed.find("#deathDateLabel").text(), parsed.find("#deathLocationLabel").text()); + let cemetery = parsed.find("#burialLocationLabel").text(); if (cemetery === "") { cemetery = parsed.find("#cemeteryNameLabel").text(); let placeinfo = parsed.find("#cemeteryNameLabel").closest("div").next(); @@ -275,25 +275,6 @@ function getFindAGraveName(focusperson) { return focusperson; } -function addEvent(profiledata, event, dateval, eventlocation) { - data = [] - if (exists(dateval) && dateval.contains(" (")) { - dateval = dateval.split(" (")[0]; - } - dateval = cleanDate(dateval); - if (dateval !== "unknown" && dateval !== "") { - data.push({date: dateval}); - } - if (eventlocation !== "") { - eventlocation = eventlocation.replace(regsaut, '').trim(); - data.push({id: geoid, location: eventlocation}); - geoid++; - } - if (!$.isEmptyObject(data)) { - profiledata[event] = data; - } - return profiledata; -} function getFAGID(url) { let fagid = url.substring(url.lastIndexOf('memorial/') + 9).replace("#", ""); @@ -323,4 +304,4 @@ function getFindAGraveFamily(famid, url, subdata) { alldata["family"][arg.title].push(person); familystatus.pop(); }); -} +} \ No newline at end of file diff --git a/collections/geneanet.js b/collections/geneanet.js index 532c5b2..f3c120e 100644 --- a/collections/geneanet.js +++ b/collections/geneanet.js @@ -1,4 +1,3 @@ -var verboselogs = false; registerCollection({ "reload": false, "experimental": true, @@ -26,79 +25,15 @@ registerCollection({ "loadPage": function(request) { var parsed = $(request.source.replace(/ li'); - var nomMaris = $(spouses[0]).find("a:not(:has(track))").first().text().split(' '); - var Nommarital =""; - if (exists(nomMaris)) { - Nommarital = nomMaris[nomMaris.length-1]; - // console.log("Nommarital ",nomMaris,Nommarital); - focusname = focusfirstName + " " + sepgeneanet +" " + Nommarital + " (" + - focuslastName+")"; - } else { - focusname = focusfirstName + " " + sepgeneanet +" " + focuslastName; - } - } - if (verboselogs) { - console.log("FocusName : ",focusname); - } - /* if (focusname.trim() === sepgeneanet) { - var nameTab = parsed.find("em[style=\"font-size:14px\"]"); - if (verboselogs) { - console.log("nameTab2 : ",nameTab); - } - focusname=nameTab.find("a:not(:has(track))").first().text() + " " + sepgeneanet +" " + nameTab.find("a:not(:has(track))").first().next().text(); - - } -*/ - if (verboselogs) { - console.log("focusname : ",focusname); - } - + focusname = nameTab.find("a:not(:has(track))").first().text() + " " + nameTab.find("a:not(:has(track))").first().next().text(); }, "parseProfileData": parseGeneanet }); -function parseGeneanet(htmlstring, familymembers, relation){ -var parsed = $(htmlstring.replace(/", '"').replace("<\/em>", '"')); + focusperson = $(nameTab).text().trim(); } - var focusperson = ""; - var Nommarital = ""; - if (genderval == "female") { - var spouses = $(parsed).find('h2:has(span:contains("Spouses")) + ul.fiche_union > li'); - var nomMaris = $(spouses[0]).find("a:not(:has(track))").first().text().split(' '); - //console.log("Female ",spouses,nomMaris); - if (exists(nomMaris)) { - Nommarital = departicule(nomMaris[nomMaris.length-1]); - focusperson = givenName + " " + sepgeneanet + " " + Nommarital +" ("+ familyName +")"; - } else { - focusperson = givenName + " " + sepgeneanet + " " + familyName; - } - } else { - focusperson = givenName + " " + sepgeneanet + " " + familyName; - } - -// on intercale un séparateur - un ou plusieurs caractères - pour servir de marqueur entre les prénoms et le nom éventuellement composé (firstname et lastname) -// var focusperson = givenName + " · " + familyName; -// var focusperson = givenName + " " + sepgeneanet + " " + familyName; - /* if (focusperson.trim() === sepgeneanet) { - // $(nameTab).html($(nameTab).html().replace("", '"').replace("<\/em>", '"')); - // focusperson = $(nameTab).text().trim(); - var nameTab = parsed.find("em[style=\"font-size:14px\"]"); - //console.log("nameTabP : ",nameTab); - focusperson=nameTab.find("a:not(:has(track))").first().text() + " " + sepgeneanet +" " + nameTab.find("a:not(:has(track))").first().next().text(); - if (verboselogs) { - console.log("focusperson : ",focusperson); - } - } -*/ - + $("#readstatus").html(escapeHtml(focusperson)); var profiledata = {name: focusperson, gender: genderval, status: relation.title}; - var img = $(nameTab).closest("table").prev().find("track").attr("src"); - - /*La référence photo du profil est local (//gw... ) les références aux profils familiaux sont normaux (https://gw...) - The photo reference of the profile is local (//gw...) the references to family profiles are normal (https://gw...) - */ - if (exists(img)) { - if(img.substring(0, 2) == "//"){ - img = "https:" + img ; - } + var img = $(nameTab).closest("table").prev().find("track").attr("src"); + if (exists(img)) { profiledata["thumb"] = img; profiledata["image"] = img.replace("/medium", "/normal"); - if (verboselogs) { - console.log("IMG :",img); - } } fullBirth = parsed.find("ul li:contains('Born ')"); @@ -200,22 +93,6 @@ function parseGeneanet1(htmlstring, familymembers, relation) { aboutdata += "===Individual Note===\n" + notes; } } -//jobs -var jobs = ""; -var jobs1 = parsed.find(".row.clearfix + ul li:last").html(); -var jobs2 = parsed.find(".row.clearfix + + ul li:last").html(); -if(jobs1 !== undefined) { - jobs = jobs1.replace(/
/g," ").trim(); -} -if(jobs2 !== undefined) { - jobs = jobs2.replace(/
/g," ").trim(); - } -if (jobs.includes('Born') || jobs.includes('Baptized') || jobs.includes('Deceased') || jobs.includes('Buried')){ -jobs = ""; -} -if (jobs !== ""){ - profiledata["occupation"] = jobs; -} familyNote = parsed.find("h3:contains('Family Note')"); if (exists(familyNote)) { @@ -237,17 +114,6 @@ if (jobs !== ""){ var famid = 0; var parents = $(parsed).find('h2:has(span:contains("Parents")) + ul li'); - // traite le cas du format "Parents photo" - if (parents.length === 0) { - if (verboselogs) { - console.log("Parsed :" + $(parsed)); - } - parents = $(parsed).find('h2:has(span:contains("Parents")) + div div div table td ul li'); - if (verboselogs) { - console.log("Parents :" + parents); - } - } - if (exists(parents[0])) { processGeneanetFamily(parents[0], "father", famid); famid++; @@ -281,8 +147,7 @@ if (jobs !== ""){ return true; } }); - // bug corrige - test sur siblings[0] au lieu de siblings[1] - if (exists(siblings[0])) { + if (exists(siblings[1])) { for (i=0; i", '"').replace("<\/em>", '"')); - var name = departicule($(nameTab).text()); + var name = $(nameTab).text(); var itemid = getGeneanetItemId(url); if (isParent(title)) { parentlist.push(itemid); @@ -478,22 +301,11 @@ function processGeneanetFamily(person, title, famid) { } function processMarriage(person, subdata) { - //console.log("Info Mariage :",$(person).text()); - //console.log("Info M2 :",$(person).text().startsWith("Married",0),$(person).text().startsWith("Married",1),$(person).text().startsWith("Married",2)); - // modif pour évacuer un saut de ligne inaproprié (quenee) corige geneanet 5/9/2024 - if ($(person).text().startsWith("Married",1) && !$(person).text().startsWith("Married to",1)) { + if ($(person).text().startsWith("Married") && !$(person).text().startsWith("Married to")) { var marriageinfo = $(person).find("em").first(); if (exists(marriageinfo)) { subdata["marriage"] = parseGeneanetDate(marriageinfo.text(), "marriage"); } - var pos = $(person).text().search("divorced"); - if (pos > 0){ - console.log("Divorce",$(person).text().slice(pos)); - var divorceinfo = $(person).text().slice(pos + 8); // 8 ="divorced" lenght - if (exists(divorceinfo)) { - subdata["divorce"] = parseGeneanetDate(divorceinfo, "divorce"); - } - } } return subdata; } @@ -534,13 +346,3 @@ function getGeneanetItemId(url) { return ""; } } -function cleanName(givenName){ - if (verboselogs) { - //console.log("Given name1 :",givenName); - } - givenName = givenName.replace(/\!|\*|_|\.|\"/g," "); - if (verboselogs) { - //console.log("Given name2 :",givenName); - } - return givenName; -} diff --git a/collections/wikitree.js b/collections/wikitree.js index 32c14a7..5331e49 100644 --- a/collections/wikitree.js +++ b/collections/wikitree.js @@ -340,16 +340,9 @@ function parseWikiTree(htmlstring, familymembers, relation) { function parseWikiEvent(vitalstring) { var data = []; var vitalinfo = vitalstring.trim().replace("[location unknown]", "").replace("[date unknown]", ""); - var datesplit = vitalinfo.split("in "); + var datesplit = vitalinfo.split(" in "); if (datesplit.length > 0) { - var dateval =""; - var datevalbrut = datesplit[0].trim(); - var datevalbrutsplit = datevalbrut.split("at "); - if (datevalbrutsplit.length > 0) { - dateval = datevalbrutsplit[0].trim(); - } else { - dateval = datevalbrut ; - } + var dateval = datesplit[0].trim(); dateval = cleanDate(dateval); if (dateval !== "") { data.push({date: dateval}); diff --git a/manifest.json b/manifest.json index 46f7239..499a6f3 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "short_name": "__MSG_appShortName__", "description": "__MSG_appDesc__", "default_locale": "en", - "version": "4.11.3.935", + "version": "4.11.3.1", "icons": { "16": "images/icon16.png", "48": "images/icon48.png", "128": "images/icon128.png" }, @@ -34,7 +34,6 @@ "*://*.geni.com/", "*://*.findagrave.com/", "*://*.familysearch.org/", - "*://*.familysearchcdn.org/", "*://familysearch.org/", "*://*.wikitree.com/", "*://*.billiongraves.com/", diff --git a/parse-names.js b/parse-names.js index 9111906..f6f41d4 100755 --- a/parse-names.js +++ b/parse-names.js @@ -177,13 +177,10 @@ var NameParse = (function(){ } if (detectMiddleName) { - const rgx =/\./g ; - firstName = firstName.replace(rgx,' ' ); //cas rare de point separateur au lieu de l'espace dans geneanet var checkmiddle = firstName.trim().split(" "); if ((middleName.trim() === "") && (checkmiddle.length > 1)) { middleName = checkmiddle.pop(); - // initialement à 2 - while (checkmiddle.length > 1) { + while (checkmiddle.length > 2) { middleName = checkmiddle.pop() + " " + middleName; } firstName = checkmiddle.join(" "); @@ -220,6 +217,7 @@ var NameParse = (function(){ middleName = ""; } } + if (birthName !== "") { var birthsplit = birthName.split(" "); birthName = ""; @@ -233,6 +231,7 @@ var NameParse = (function(){ } birthName = this.removeIgnoredChars(birthName); } + if (suffix !== false && suffix !== "" && lastName === "" && birthName === "") { //For names like John Ma, where the last name is detected as a suffix suffix = ""; @@ -256,8 +255,7 @@ var NameParse = (function(){ var nickfirst = nickParts.join(" "); nickfirst = nickfirst.replace("(",""); nickfirst = nickfirst.replace(")",""); - //nickfirst = nickfirst.replace("\""/g,''); - //nickfirst = nickfirst.replace("*"/g,''); + nickfirst = nickfirst.replace(/"/g,''); nickfirst = this.fix_case(nickfirst.trim()); nickName = nickfirst + " " + lastName.trim(); if (birthName !== "") { @@ -268,21 +266,7 @@ var NameParse = (function(){ } } - - // Ajout pour traiter partiellement les specificités des prénoms composés français - //console.log("Data1 :",firstName); - firstName = firstName.replace(/\*/g,""); - firstName = firstName.replace(/\./g,""); - firstName = firstName.replace(/\!/g,""); - if (sepgeneanet !== "") { - if (firstName.trim() === "Marie" || firstName.trim() === "Jean") { - if (middleName.trim() !=="Joseph") { - firstName = firstName + " " + middleName ; - middleName = "" ; - } - } - } - // return the various parts in an array + // return the various parts in an array return { "prefix": prefix || "", "salutation": salutation || "", @@ -342,11 +326,7 @@ var NameParse = (function(){ } //ignore periods and commas word = word.replace(/\./g,""); - word = word.replace(/\,/g,""); - word = word.replace(/\*/g,""); - word = word.replace(/\!/g,""); - //passage caractere special geneanet.js a eliminer apres emploi - word = word.replace(sepgeneanet,""); + word = word.replace(/,/g,""); return word; }; @@ -382,9 +362,6 @@ var NameParse = (function(){ word = word.replace(/\s*\/\s*/g,'/'); word = word.replace(/“/g, '"'); word = word.replace(/”/g, '"'); - word = word.replace(/\,/g, ' '); - //word = word.replace(/\"/g, ''); - //word = word.replace(/\*/g, ' '); return word; } @@ -413,8 +390,8 @@ var NameParse = (function(){ // detect compound last names like "Von Fange" NameParse.is_compound_lastName = function (word) { word = word.toLocaleLowerCase(); - // these are some common prefixes that identify a compound last names - what am I missing? - rajout de · (geneanet) 4/9/2023 - var words = ['vere','von','van','de','der','del','della','di','da', 'do', 'pietro','vanden','du','st.','st','la','le','lo', 'las', 'los', 'ter','o', 'y', "o'",'mc','mac','fitz',sepgeneanet]; + // these are some common prefixes that identify a compound last names - what am I missing? + var words = ['vere','von','van','de','der','del','della','di','da', 'do', 'pietro','vanden','du','st.','st','la','le','lo', 'las', 'los', 'ter','o', 'y', "o'",'mc','mac','fitz']; return (words.indexOf(word) >= 0); }; @@ -446,8 +423,6 @@ var NameParse = (function(){ word = this.safe_ucfirst("-",word); // uppercase words split by periods, like "J.P." word = this.safe_ucfirst(".",word); - // uppercase words split by periods' like "d'Albis" - word = this.safe_ucfirst("'",word); return word; }; diff --git a/popup.html b/popup.html index 381f2ca..41cb18d 100644 --- a/popup.html +++ b/popup.html @@ -175,7 +175,8 @@
- +