From c8e562f37781d62ebc54b68ef74f7693de79a907 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 29 Nov 2019 19:08:35 +0800 Subject: [PATCH] AGPLv3: The work must carry prominent notices stating that you modified it, and giving a relevant date --- .../plugins/translation_manager/extract_new_sheet_names.cpp | 1 + .../src/plugins/translation_manager/extract_new_sheet_names.h | 1 + code/tool/attribution/annotate.py | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp b/code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp index 98c0164f6..c53481084 100644 --- a/code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp +++ b/code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp @@ -3,6 +3,7 @@ // // This source file has been modified by the following contributors: // Copyright (C) 2011 Dzmitry KAMIAHIN (dnk-88) +// Copyright (C) 2011 Emanuel COSTEA // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as diff --git a/code/studio/src/plugins/translation_manager/extract_new_sheet_names.h b/code/studio/src/plugins/translation_manager/extract_new_sheet_names.h index c445dd975..f9ef8a38b 100644 --- a/code/studio/src/plugins/translation_manager/extract_new_sheet_names.h +++ b/code/studio/src/plugins/translation_manager/extract_new_sheet_names.h @@ -3,6 +3,7 @@ // // This source file has been modified by the following contributors: // Copyright (C) 2011 Dzmitry KAMIAHIN (dnk-88) +// Copyright (C) 2011 Emanuel COSTEA // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as diff --git a/code/tool/attribution/annotate.py b/code/tool/attribution/annotate.py index 9098b9007..02082bc7f 100644 --- a/code/tool/attribution/annotate.py +++ b/code/tool/attribution/annotate.py @@ -222,7 +222,9 @@ def remap_author(blob, commit, author): # them, remap here, limit by authored_date if needed. if short_author == "ulukyn" or short_author == "ace": short_author = "winch_gate" - if short_author == "riasan" or short_author == "sircotare": + if short_author == "riasan": + short_author = "winch_gate" + if short_author == "sircotare" and authored_date.year >= 2012: short_author = "winch_gate" if short_author == "inky": short_author = "winch_gate"