-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tut. > Theme Objects > Add TEXT and move ControlPanel #713 #714
Tut. > Theme Objects > Add TEXT and move ControlPanel #713 #714
Conversation
@david-poindexter Hmm, not sure how I could have prevented that merge conflict..? Maybe I should have done it in 2 PRs? |
@valadas Hmm. "index.ascx.resx" does work (I have it in my test Theme). |
Typically this happens due to the current state of the branch from which you based your working branch. If it is not up to date with the latest version, then you could simply get the latest from the base branch and merge it into your working branch. Alternately, we could try to manually |
Hmm, apparently, I am wrong (or this has changed at some point in DNN history). I just tested and you are right about the file name at least in current versions. I could have sworn I had old themes using just the folder name for the file so the localization would be available for multiple layouts having a single source of truth. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was wrong on my requested changes and I resolved the merge conflict. This now looks good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @Timo-Breumelhof
Actually that's a valid point. It would be nice if you could have one resx file for all layouts. |
@Timo-Breumelhof |
I also had the idea something like that existed but it does not seem to work. |
ok, maybe I mix it up with skin.css and skin.js. |
Strange, I was also pretty sure there was a way to not have to do a file for each control and there was a way to have a file for the whole theme. I was proved wrong though... |
Closes #713